diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h index a0843efed0..29285adeab 100644 --- a/include/wx/msw/app.h +++ b/include/wx/msw/app.h @@ -102,10 +102,6 @@ public: // wasn't found at all static int GetComCtl32Version(); - // the same for shell32.dll: returns 400, 471, 500, 600, ... (4.70 not - // currently detected) - static int GetShell32Version(); - // the SW_XXX value to be used for the frames opened by the application // (currently seems unused which is a bug -- TODO) static int m_nCmdShow; diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 2f6a62fb87..450605f09f 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -892,37 +892,6 @@ int wxApp::GetComCtl32Version() return s_verComCtl32; } -/* static */ -int wxApp::GetShell32Version() -{ - static int s_verShell32 = -1; - if ( s_verShell32 == -1 ) - { - // we're prepared to handle the errors - wxLogNull noLog; - - wxDynamicLibrary dllShell32(wxT("shell32.dll"), wxDL_VERBATIM); - if ( dllShell32.IsLoaded() ) - { - s_verShell32 = CallDllGetVersion(dllShell32); - - if ( !s_verShell32 ) - { - // there doesn't seem to be any way to distinguish between 4.00 - // and 4.70 (starting from 4.71 we have DllGetVersion()) so - // just assume it is 4.0 - s_verShell32 = 400; - } - } - else // failed load the DLL? - { - s_verShell32 = 0; - } - } - - return s_verShell32; -} - #else // !wxUSE_DYNLIB_CLASS /* static */ @@ -931,12 +900,6 @@ int wxApp::GetComCtl32Version() return 0; } -/* static */ -int wxApp::GetShell32Version() -{ - return 0; -} - #endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS #if wxUSE_EXCEPTIONS diff --git a/src/msw/notifmsg.cpp b/src/msw/notifmsg.cpp index 61d3d656ad..d25e9ab5fe 100644 --- a/src/msw/notifmsg.cpp +++ b/src/msw/notifmsg.cpp @@ -452,7 +452,7 @@ bool wxNotificationMessage::Show(int timeout) { if ( !m_impl ) { - if ( !ms_alwaysUseGeneric && wxTheApp->GetShell32Version() >= 500 ) + if ( !ms_alwaysUseGeneric ) { if ( timeout == Timeout_Never ) m_impl = new wxManualNotifMsgImpl(GetParent()); diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index f5d9fd1368..a09cff9964 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -45,14 +45,6 @@ #define NIF_INFO 0x00000010 #endif -#ifndef NOTIFYICONDATA_V1_SIZE - #ifdef UNICODE - #define NOTIFYICONDATA_V1_SIZE 0x0098 - #else - #define NOTIFYICONDATA_V1_SIZE 0x0058 - #endif -#endif - #ifndef NOTIFYICONDATA_V2_SIZE #ifdef UNICODE #define NOTIFYICONDATA_V2_SIZE 0x03A8 @@ -122,12 +114,8 @@ struct NotifyIconData : public NOTIFYICONDATA // we could do complicated tests for the exact system version it's // easier to just use an old size which should be supported everywhere // from Windows 2000 up and which is all we need as we don't use any - // newer features so far. But if we're running under a really ancient - // system (Win9x), fall back to even smaller size -- then the balloon - // related features won't be available but the rest will still work. - cbSize = wxTheApp->GetShell32Version() >= 500 - ? NOTIFYICONDATA_V2_SIZE - : NOTIFYICONDATA_V1_SIZE; + // newer features so far. + cbSize = NOTIFYICONDATA_V2_SIZE; hWnd = (HWND) hwnd; uCallbackMessage = gs_msgTaskbar;