check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 0736768648dc6d00a0a594679611179129c74b04..83aef42cde8cb73f565a636a90ecffa0c8dd6b8b 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -32,6 +32,11 @@
 #include "wx/taskbar.h"
 #include "wx/dynlib.h"
 
 #include "wx/taskbar.h"
 #include "wx/dynlib.h"
 

+#ifndef NIN_BALLOONTIMEOUT
+    #define NIN_BALLOONTIMEOUT      0x0404
+    #define NIN_BALLOONUSERCLICK    0x0405
+#endif
+

 // initialized on demand
 static UINT gs_msgTaskbar = 0;
 static UINT gs_msgRestartTaskbar = 0;
 // initialized on demand
 static UINT gs_msgTaskbar = 0;
 static UINT gs_msgRestartTaskbar = 0;


@@ -143,11 +148,17 @@ wxTaskBarIcon::wxTaskBarIcon()
 
 wxTaskBarIcon::~wxTaskBarIcon()
 {
 
 wxTaskBarIcon::~wxTaskBarIcon()
 {

-    if (m_iconAdded)
+    if ( m_iconAdded )

         RemoveIcon();
 
         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
 }
 
 // Operations