| OLD | NEW |
| 1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" |
| 2 | 2 |
| 3 #include "PluginClass.h" | 3 #include "PluginClass.h" |
| 4 #include "PluginSettings.h" | 4 #include "PluginSettings.h" |
| 5 #include "PluginSystem.h" | 5 #include "PluginSystem.h" |
| 6 #ifdef SUPPORT_FILTER | 6 #ifdef SUPPORT_FILTER |
| 7 #include "PluginFilter.h" | 7 #include "PluginFilter.h" |
| 8 #endif | 8 #endif |
| 9 #include "PluginMimeFilterClient.h" | 9 #include "PluginMimeFilterClient.h" |
| 10 #include "PluginClient.h" | 10 #include "PluginClient.h" |
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 660 case DISPID_BEFORENAVIGATE: | 660 case DISPID_BEFORENAVIGATE: |
| 661 DEBUG_NAVI("Navi::BeforeNavigate") | 661 DEBUG_NAVI("Navi::BeforeNavigate") |
| 662 return VARIANT_TRUE; | 662 return VARIANT_TRUE; |
| 663 case DISPID_COMMANDSTATECHANGE: | 663 case DISPID_COMMANDSTATECHANGE: |
| 664 if (m_hPaneWnd == NULL) | 664 if (m_hPaneWnd == NULL) |
| 665 { | 665 { |
| 666 CreateStatusBarPane(); | 666 CreateStatusBarPane(); |
| 667 } | 667 } |
| 668 else | 668 else |
| 669 { | 669 { |
| 670 if (CPluginClient::GetInstance()->GetIEVersion() > 6) | 670 if ( ABP::IE::installed_major_version() > 6 ) |
| 671 { | 671 { |
| 672 RECT rect; | 672 RECT rect; |
| 673 BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect); | 673 BOOL rectRes = GetClientRect(m_hStatusBarWnd, &rect); |
| 674 if (rectRes == TRUE) | 674 if (rectRes == TRUE) |
| 675 { | 675 { |
| 676 MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.bottom
- rect.top, TRUE); | 676 MoveWindow(m_hPaneWnd, rect.right - 200, 0, m_nPaneWidth, rect.bottom
- rect.top, TRUE); |
| 677 } | 677 } |
| 678 } | 678 } |
| 679 } | 679 } |
| 680 break; | 680 break; |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 817 s_criticalSectionLocal.Unlock(); | 817 s_criticalSectionLocal.Unlock(); |
| 818 | 818 |
| 819 if (!GetAtomPaneClass()) | 819 if (!GetAtomPaneClass()) |
| 820 { | 820 { |
| 821 DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_REGISTE
R_PANE_CLASS, L"Class::InitObject - RegisterClassEx"); | 821 DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_REGISTE
R_PANE_CLASS, L"Class::InitObject - RegisterClassEx"); |
| 822 return false; | 822 return false; |
| 823 } | 823 } |
| 824 } | 824 } |
| 825 | 825 |
| 826 | 826 |
| 827 int ieVersion = CPluginClient::GetInstance()->GetIEVersion(); | 827 int ieVersion = ABP::IE::installed_major_version(); |
| 828 // Create status pane | 828 // Create status pane |
| 829 if (bBHO && ieVersion > 6 && !CreateStatusBarPane()) | 829 if (bBHO && ieVersion > 6 && !CreateStatusBarPane()) |
| 830 { | 830 { |
| 831 return false; | 831 return false; |
| 832 } | 832 } |
| 833 | 833 |
| 834 if (CPluginClient::GetInstance()->IsFirstRun()) | 834 if (CPluginClient::GetInstance()->IsFirstRun()) |
| 835 { | 835 { |
| 836 // IE6 can't be accessed from another thread, execute in current thread | 836 // IE6 can't be accessed from another thread, execute in current thread |
| 837 if (ieVersion < 7) | 837 if (ieVersion < 7) |
| (...skipping 1118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1956 } | 1956 } |
| 1957 } | 1957 } |
| 1958 } | 1958 } |
| 1959 | 1959 |
| 1960 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); | 1960 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); |
| 1961 } | 1961 } |
| 1962 | 1962 |
| 1963 return hTabWnd; | 1963 return hTabWnd; |
| 1964 | 1964 |
| 1965 } | 1965 } |
| OLD | NEW |