X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..c92e136d9a2d9919fc747d109610cd4d16c6cc91:/src/msw/taskbar.cpp?ds=inline diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index a064e5df9e..91bd88cfaa 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -24,12 +24,14 @@ #include "wx/frame.h" #include "wx/utils.h" #include "wx/menu.h" + #include "wx/app.h" #endif #include "wx/msw/wrapshl.h" #include #include "wx/taskbar.h" +#include "wx/msw/private.h" #include "wx/dynlib.h" #ifndef NIN_BALLOONTIMEOUT @@ -45,6 +47,21 @@ #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 + #else + #define NOTIFYICONDATA_V2_SIZE 0x01E8 + #endif +#endif // initialized on demand static UINT gs_msgTaskbar = 0; @@ -133,7 +150,19 @@ struct NotifyIconData : public NOTIFYICONDATA NotifyIconData(WXHWND hwnd) { memset(this, 0, sizeof(NOTIFYICONDATA)); - cbSize = sizeof(NOTIFYICONDATA); + + // Do _not_ use sizeof(NOTIFYICONDATA) here, it may be too big if we're + // compiled with newer headers but running on an older system and while + // 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; + hWnd = (HWND) hwnd; uCallbackMessage = gs_msgTaskbar; uFlags = NIF_MESSAGE; @@ -231,7 +260,7 @@ wxTaskBarIcon::ShowBalloon(const wxString& title, // the balloon disappearance NotifyIconData notifyData(hwnd); notifyData.uFlags = 0; - notifyData.uVersion = 3 /* NOTIFYICON_VERSION for Windows XP */; + notifyData.uVersion = 3 /* NOTIFYICON_VERSION for Windows 2000/XP */; if ( !wxShellNotifyIcon(NIM_SETVERSION, ¬ifyData) ) {