changed wxAuiBlendColour() to work with unsigned chars instead of doubles as it's...

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index be935781d7747a66bad02bce9ca90475791d9755..cc52113434070e94a6a1e188e3c1e4f5dd76e1d3 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -32,6 +32,20 @@
 #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
+
+#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;
 // initialized on demand
 static UINT gs_msgTaskbar = 0;
 static UINT gs_msgRestartTaskbar = 0;


@@ -143,11 +157,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


@@ -189,6 +209,8 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
     return ok;
 }
 
     return ok;
 }
 

+#if wxUSE_TASKBARICON_BALLOONS
+

 bool
 wxTaskBarIcon::ShowBalloon(const wxString& title,
                            const wxString& text,
 bool
 wxTaskBarIcon::ShowBalloon(const wxString& title,
                            const wxString& text,


@@ -198,7 +220,19 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
     wxCHECK_MSG( m_iconAdded, false,
                     _T("can't be used before the icon is created") );
 
     wxCHECK_MSG( m_iconAdded, false,
                     _T("can't be used before the icon is created") );
 

-    NotifyIconData notifyData(GetHwndOf(m_win));
+    const HWND hwnd = GetHwndOf(m_win);
+
+    // we need to enable version 5.0 behaviour to receive notifications about
+    // the balloon disappearance
+    NotifyIconData notifyData(hwnd);
+    notifyData.uFlags = 0;
+    notifyData.uVersion = 3 /* NOTIFYICON_VERSION for Windows XP */;
+
+    wxShellNotifyIcon(NIM_SETVERSION, &notifyData);
+
+
+    // do show the balloon now
+    notifyData = NotifyIconData(hwnd);

     notifyData.uFlags |= NIF_INFO;
     notifyData.uTimeout = msec;
     wxStrncpy(notifyData.szInfo, text.wx_str(), WXSIZEOF(notifyData.szInfo));
     notifyData.uFlags |= NIF_INFO;
     notifyData.uTimeout = msec;
     wxStrncpy(notifyData.szInfo, text.wx_str(), WXSIZEOF(notifyData.szInfo));


@@ -215,6 +249,8 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
     return wxShellNotifyIcon(NIM_MODIFY, &notifyData) != 0;
 }
 
     return wxShellNotifyIcon(NIM_MODIFY, &notifyData) != 0;
 }
 

+#endif // wxUSE_TASKBARICON_BALLOONS
+

 bool wxTaskBarIcon::RemoveIcon()
 {
     if (!m_iconAdded)
 bool wxTaskBarIcon::RemoveIcon()
 {
     if (!m_iconAdded)


@@ -289,9 +325,7 @@ long wxTaskBarIcon::WindowProc(unsigned int msg,
                                unsigned int WXUNUSED(wParam),
                                long lParam)
 {
                                unsigned int WXUNUSED(wParam),
                                long lParam)
 {

-    wxEventType eventType = 0;
-
-    if (msg == gs_msgRestartTaskbar)   // does the icon need to be redrawn?
+    if ( msg == gs_msgRestartTaskbar )   // does the icon need to be redrawn?

     {
         m_iconAdded = false;
         SetIcon(m_icon, m_strTooltip);
     {
         m_iconAdded = false;
         SetIcon(m_icon, m_strTooltip);


@@ -299,9 +333,10 @@ long wxTaskBarIcon::WindowProc(unsigned int msg,
     }
 
     // this function should only be called for gs_msg(Restart)Taskbar messages
     }
 
     // this function should only be called for gs_msg(Restart)Taskbar messages

-    wxASSERT(msg == gs_msgTaskbar);
+    wxASSERT( msg == gs_msgTaskbar );

 
 

-    switch (lParam)
+    wxEventType eventType = 0;
+    switch ( lParam )

     {
         case WM_LBUTTONDOWN:
             eventType = wxEVT_TASKBAR_LEFT_DOWN;
     {
         case WM_LBUTTONDOWN:
             eventType = wxEVT_TASKBAR_LEFT_DOWN;


@@ -331,11 +366,16 @@ long wxTaskBarIcon::WindowProc(unsigned int msg,
             eventType = wxEVT_TASKBAR_MOVE;
             break;
 
             eventType = wxEVT_TASKBAR_MOVE;
             break;
 

-        default:
+        case NIN_BALLOONTIMEOUT:
+            eventType = wxEVT_TASKBAR_BALLOON_TIMEOUT;
+            break;
+
+        case NIN_BALLOONUSERCLICK:
+            eventType = wxEVT_TASKBAR_BALLOON_CLICK;

             break;
     }
 
             break;
     }
 

-    if (eventType)
+    if ( eventType )

     {
         wxTaskBarIconEvent event(eventType, this);
 
     {
         wxTaskBarIconEvent event(eventType, this);