X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..5ebdc86afc95a60fbeb0b2a71c38dd26c8a1b0b4:/src/msw/taskbar.cpp

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index b64a50cdf1..3d8de5f7c6 100644
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -33,13 +33,13 @@
 
 #include <windows.h>
 #include <string.h>
-#include <wx/msw/taskbar.h>
-#include <wx/msw/private.h>
+#include "wx/msw/taskbar.h"
+#include "wx/msw/private.h"
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
 #ifndef wxUSE_NORLANDER_HEADERS
-#include <wx/msw/gnuwin32/extra.h>
+#include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
 #endif
@@ -51,14 +51,13 @@
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
 				     UINT wParam, LONG lParam );
 
-wxChar *wxTaskBarWindowClass = T("wxTaskBarWindowClass");
+wxChar *wxTaskBarWindowClass = wxT("wxTaskBarWindowClass");
 
 wxList wxTaskBarIcon::sm_taskBarIcons;
 bool   wxTaskBarIcon::sm_registeredClass = FALSE;
 UINT   wxTaskBarIcon::sm_taskbarMsg = 0;
 
 
-#if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
     EVT_TASKBAR_MOVE         (wxTaskBarIcon::_OnMouseMove)
     EVT_TASKBAR_LEFT_DOWN    (wxTaskBarIcon::_OnLButtonDown)
@@ -71,7 +70,6 @@ END_EVENT_TABLE()
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
-#endif
 
 
 wxTaskBarIcon::wxTaskBarIcon(void)
@@ -120,7 +118,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 	    notifyData.hIcon = (HICON) icon.GetHICON();
     }
 
-    if (((const wxChar*) tooltip != NULL) && (tooltip != T("")))
+    if (((const wxChar*) tooltip != NULL) && (tooltip != wxT("")))
     {
         notifyData.uFlags |= NIF_TIP ;
 		lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip));
@@ -262,7 +260,7 @@ bool wxTaskBarIcon::RegisterWindowClass()
         return TRUE;
 
     // Also register the taskbar message here
-    sm_taskbarMsg = ::RegisterWindowMessage(T("wxTaskBarIconMessage"));
+    sm_taskbarMsg = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage"));
 
     WNDCLASS	wc;
     bool	rc;
@@ -294,7 +292,7 @@ WXHWND wxTaskBarIcon::CreateTaskBarWindow()
     HINSTANCE hInstance = GetModuleHandle(NULL);
 
     HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass,
-            T("wxTaskBarWindow"),
+            wxT("wxTaskBarWindow"),
             WS_OVERLAPPED,
             0,
             0,