Rework the wxCusor ctor taking wx stock number to provide as many cursors as

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 8bc91d1d2f26ce2e98d18ddc5e1f3469ced14969..0a6277803fba8dfd6c30c723d6e130b9561d1cc2 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -17,6 +17,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_TASKBARICON
+

 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/frame.h"


@@ -143,10 +145,11 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
         notifyData.hIcon = GetHiconOf(icon);
     }
 
         notifyData.hIcon = GetHiconOf(icon);
     }
 

+    // set NIF_TIP even for an empty tooltip: otherwise it would be impossible
+    // to remove an existing tooltip using this function
+    notifyData.uFlags |= NIF_TIP;

     if ( !tooltip.empty() )
     {
     if ( !tooltip.empty() )
     {

-        notifyData.uFlags |= NIF_TIP;
-//        lstrcpyn(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip));

         wxStrncpy(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip));
     }
 
         wxStrncpy(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip));
     }
 


@@ -171,6 +174,7 @@ bool wxTaskBarIcon::RemoveIcon()
     return Shell_NotifyIcon(NIM_DELETE, &notifyData) != 0;
 }
 
     return Shell_NotifyIcon(NIM_DELETE, &notifyData) != 0;
 }
 

+#if wxUSE_MENUS

 bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 {
     wxASSERT_MSG( m_win != NULL, _T("taskbar icon not initialized") );
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 {
     wxASSERT_MSG( m_win != NULL, _T("taskbar icon not initialized") );


@@ -206,6 +210,7 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 
     return rval;
 }
 
     return rval;
 }

+#endif // wxUSE_MENUS

 
 void wxTaskBarIcon::RegisterWindowMessages()
 {
 
 void wxTaskBarIcon::RegisterWindowMessages()
 {


@@ -285,3 +290,6 @@ long wxTaskBarIcon::WindowProc(unsigned int msg,
 
     return 0;
 }
 
     return 0;
 }

+
+#endif // wxUSE_TASKBARICON
+