X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c6e72bbf3468457ed0c6010c7a2eafc6d7f33224..2edac25b2ea3876bf57a54d314d59050b5fbd8e7:/src/msw/taskbar.cpp?ds=sidebyside

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index b03a1bebd1..cc52113434 100644
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -37,6 +37,15 @@
     #define NIN_BALLOONUSERCLICK    0x0405
 #endif
 
+#ifndef NIM_SETVERSION
+    #define NIM_SETVERSION  0x00000004
+#endif
+
+#ifndef NIF_INFO
+    #define NIF_INFO        0x00000010
+#endif
+
+
 // initialized on demand
 static UINT gs_msgTaskbar = 0;
 static UINT gs_msgRestartTaskbar = 0;
@@ -148,11 +157,17 @@ wxTaskBarIcon::wxTaskBarIcon()
 
 wxTaskBarIcon::~wxTaskBarIcon()
 {
-    if (m_iconAdded)
+    if ( m_iconAdded )
         RemoveIcon();
 
-    if (m_win)
-        m_win->Destroy();
+    if ( m_win )
+    {
+        // we must use delete and not Destroy() here because the latter will
+        // only schedule the window to be deleted during the next idle event
+        // processing but we may not get any idle events if there are no other
+        // windows left in the program
+        delete m_win;
+    }
 }
 
 // Operations
@@ -194,6 +209,8 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
     return ok;
 }
 
+#if wxUSE_TASKBARICON_BALLOONS
+
 bool
 wxTaskBarIcon::ShowBalloon(const wxString& title,
                            const wxString& text,
@@ -232,6 +249,8 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
     return wxShellNotifyIcon(NIM_MODIFY, &notifyData) != 0;
 }
 
+#endif // wxUSE_TASKBARICON_BALLOONS
+
 bool wxTaskBarIcon::RemoveIcon()
 {
     if (!m_iconAdded)