better update rect calculation

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 68c7ac60aa166b993a29445e3c85e88604635fa4..fdf563dc377958c13b6a9de3d0664a1b4a2bb02b 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -28,21 +28,27 @@
 #include "wx/utils.h"
 #endif
 
-#ifdef __WIN95__
+#if defined(__WIN95__) && !defined(__TWIN32__)
 
 #include <windows.h>
 #include <string.h>
 #include <wx/msw/taskbar.h>
 #include <wx/msw/private.h>
 
+#ifndef __TWIN32__
 #ifdef __GNUWIN32__
 #include <wx/msw/gnuwin32/extra.h>
 #endif
+#endif
+
+#ifdef __SALFORDC__
+#include <shellapi.h>
+#endif
 
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
                                     UINT wParam, LONG lParam );
 
-char *wxTaskBarWindowClass = "wxTaskBarWindowClass";
+wxChar *wxTaskBarWindowClass = _T("wxTaskBarWindowClass");
 
 wxList wxTaskBarIcon::sm_taskBarIcons;
 bool   wxTaskBarIcon::sm_registeredClass = FALSE;
@@ -111,10 +117,10 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
            notifyData.hIcon = (HICON) icon.GetHICON();
     }
 
-    if (((const char*) tooltip != NULL) && (tooltip != ""))
+    if (((const wxChar*) tooltip != NULL) && (tooltip != _T("")))
     {
         notifyData.uFlags |= NIF_TIP ;
-               lstrcpyn(notifyData.szTip, (char*) (const char*) tooltip, sizeof(notifyData.szTip));
+               lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip));
     }
 
     notifyData.uID = 99;
@@ -233,7 +239,7 @@ bool wxTaskBarIcon::RegisterWindowClass()
         return TRUE;
 
     // Also register the taskbar message here
-    sm_taskbarMsg = ::RegisterWindowMessage("wxTaskBarIconMessage");
+    sm_taskbarMsg = ::RegisterWindowMessage(_T("wxTaskBarIconMessage"));
 
     WNDCLASS   wc;
     bool       rc;
@@ -265,7 +271,7 @@ WXHWND wxTaskBarIcon::CreateTaskBarWindow()
     HINSTANCE hInstance = GetModuleHandle(NULL);
 
     HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass,
-            "wxTaskBarWindow",
+            _T("wxTaskBarWindow"),
             WS_OVERLAPPED,
             0,
             0,