don't keep dangling m_prevRadio pointer (2nd part of patch 1836644)

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index d665f81e5c831036aec4a689b5d6d59cc16115dc..cfda8455432da0f950553180a23b98b2389faa97 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -30,10 +30,11 @@
 
 #include <string.h>
 #include "wx/taskbar.h"
 
 #include <string.h>
 #include "wx/taskbar.h"

+#include "wx/dynlib.h"

 
 // initialized on demand
 
 // initialized on demand

-UINT   gs_msgTaskbar = 0;
-UINT   gs_msgRestartTaskbar = 0;
+static UINT gs_msgTaskbar = 0;
+static UINT gs_msgRestartTaskbar = 0;

 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)


@@ -42,6 +43,38 @@ IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+// wrapper around Shell_NotifyIcon(): this function is not present in Win95
+// shell32.dll so load it dynamically to allow programs using wxTaskBarIcon to
+// start under this OS
+static BOOL wxShellNotifyIcon(DWORD dwMessage, NOTIFYICONDATA *pData)
+{
+#if wxUSE_DYNLIB_CLASS
+    typedef BOOL (WINAPI *Shell_NotifyIcon_t)(DWORD, NOTIFYICONDATA *);
+
+    static Shell_NotifyIcon_t s_pfnShell_NotifyIcon = NULL;
+    static bool s_initialized = false;
+    if ( !s_initialized )
+    {
+        s_initialized = true;
+
+        wxLogNull noLog;
+        wxDynamicLibrary dllShell("shell32.dll");
+        if ( dllShell.IsLoaded() )
+        {
+            wxDL_INIT_FUNC_AW(s_pfn, Shell_NotifyIcon, dllShell);
+        }
+
+        // NB: it's ok to destroy dllShell here, we link to shell32.dll
+        //     implicitly so it won't be unloaded
+    }
+
+    return s_pfnShell_NotifyIcon ? (*s_pfnShell_NotifyIcon)(dwMessage, pData)
+                                 : FALSE;
+#else // !wxUSE_DYNLIB_CLASS
+    return Shell_NotifyIcon(dwMessage, pData);
+#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
+}
+

 // ----------------------------------------------------------------------------
 // wxTaskBarIconWindow: helper window
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTaskBarIconWindow: helper window
 // ----------------------------------------------------------------------------


@@ -147,8 +180,8 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
         wxStrncpy(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip));
     }
 
         wxStrncpy(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip));
     }
 

-    bool ok = Shell_NotifyIcon(m_iconAdded ? NIM_MODIFY
-                                           : NIM_ADD, &notifyData) != 0;
+    bool ok = wxShellNotifyIcon(m_iconAdded ? NIM_MODIFY
+                                            : NIM_ADD, &notifyData) != 0;

 
     if ( !m_iconAdded && ok )
         m_iconAdded = true;
 
     if ( !m_iconAdded && ok )
         m_iconAdded = true;


@@ -165,7 +198,7 @@ bool wxTaskBarIcon::RemoveIcon()
 
     NotifyIconData notifyData(GetHwndOf(m_win));
 
 
     NotifyIconData notifyData(GetHwndOf(m_win));
 

-    return Shell_NotifyIcon(NIM_DELETE, &notifyData) != 0;
+    return wxShellNotifyIcon(NIM_DELETE, &notifyData) != 0;

 }
 
 #if wxUSE_MENUS
 }
 
 #if wxUSE_MENUS


@@ -236,6 +269,7 @@ long wxTaskBarIcon::WindowProc(unsigned int msg,
     {
         m_iconAdded = false;
         SetIcon(m_icon, m_strTooltip);
     {
         m_iconAdded = false;
         SetIcon(m_icon, m_strTooltip);

+        return 0;

     }
 
     // this function should only be called for gs_msg(Restart)Taskbar messages
     }
 
     // this function should only be called for gs_msg(Restart)Taskbar messages