missing commit

[wxWidgets.git] / src / msw / taskbar.cpp

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index a064e5df9e8b0a285073561e352559205573b995..4141b0e3c86140d50c7ba38782875a00676e38d5 100644 (file)
--- 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/frame.h"
     #include "wx/utils.h"
     #include "wx/menu.h"

+    #include "wx/app.h"

 #endif
 
 #include "wx/msw/wrapshl.h"
 
 #include <string.h>
 #include "wx/taskbar.h"
 #endif
 
 #include "wx/msw/wrapshl.h"
 
 #include <string.h>
 #include "wx/taskbar.h"

+#include "wx/msw/private.h"

 #include "wx/dynlib.h"
 
 #ifndef NIN_BALLOONTIMEOUT
 #include "wx/dynlib.h"
 
 #ifndef NIN_BALLOONTIMEOUT


@@ -45,6 +47,21 @@
     #define NIF_INFO        0x00000010
 #endif
 
     #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;
 
 // initialized on demand
 static UINT gs_msgTaskbar = 0;


@@ -133,7 +150,19 @@ struct NotifyIconData : public NOTIFYICONDATA
     NotifyIconData(WXHWND hwnd)
     {
         memset(this, 0, sizeof(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;
         hWnd = (HWND) hwnd;
         uCallbackMessage = gs_msgTaskbar;
         uFlags = NIF_MESSAGE;


@@ -148,7 +177,7 @@ struct NotifyIconData : public NOTIFYICONDATA
 // wxTaskBarIcon
 // ----------------------------------------------------------------------------
 
 // wxTaskBarIcon
 // ----------------------------------------------------------------------------
 

-wxTaskBarIcon::wxTaskBarIcon()
+wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType))

 {
     m_win = NULL;
     m_iconAdded = false;
 {
     m_win = NULL;
     m_iconAdded = false;


@@ -186,7 +215,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 
     NotifyIconData notifyData(GetHwndOf(m_win));
 
 
     NotifyIconData notifyData(GetHwndOf(m_win));
 

-    if (icon.Ok())
+    if (icon.IsOk())

     {
         notifyData.uFlags |= NIF_ICON;
         notifyData.hIcon = GetHiconOf(icon);
     {
         notifyData.uFlags |= NIF_ICON;
         notifyData.hIcon = GetHiconOf(icon);


@@ -197,7 +226,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
     notifyData.uFlags |= NIF_TIP;
     if ( !tooltip.empty() )
     {
     notifyData.uFlags |= NIF_TIP;
     if ( !tooltip.empty() )
     {

-        wxStrlcpy(notifyData.szTip, tooltip.wx_str(), WXSIZEOF(notifyData.szTip));
+        wxStrlcpy(notifyData.szTip, tooltip.t_str(), WXSIZEOF(notifyData.szTip));

     }
 
     bool ok = wxShellNotifyIcon(m_iconAdded ? NIM_MODIFY
     }
 
     bool ok = wxShellNotifyIcon(m_iconAdded ? NIM_MODIFY


@@ -231,7 +260,7 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
     // the balloon disappearance
     NotifyIconData notifyData(hwnd);
     notifyData.uFlags = 0;
     // 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, &notifyData) )
     {
 
     if ( !wxShellNotifyIcon(NIM_SETVERSION, &notifyData) )
     {


@@ -242,8 +271,8 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
     notifyData = NotifyIconData(hwnd);
     notifyData.uFlags |= NIF_INFO;
     notifyData.uTimeout = msec;
     notifyData = NotifyIconData(hwnd);
     notifyData.uFlags |= NIF_INFO;
     notifyData.uTimeout = msec;

-    wxStrlcpy(notifyData.szInfo, text.wx_str(), WXSIZEOF(notifyData.szInfo));
-    wxStrlcpy(notifyData.szInfoTitle, title.wx_str(),
+    wxStrlcpy(notifyData.szInfo, text.t_str(), WXSIZEOF(notifyData.szInfo));
+    wxStrlcpy(notifyData.szInfoTitle, title.t_str(),

                 WXSIZEOF(notifyData.szInfoTitle));
 
     if ( flags & wxICON_INFORMATION )
                 WXSIZEOF(notifyData.szInfoTitle));
 
     if ( flags & wxICON_INFORMATION )