Applied patch [ 652491 ] Update makefiles for mingw

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index fa2ae4311161dffc0a69850c6ffbbb29816178a6..d422b3c214ff7528490cc73a073b7e09e958bac5 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -52,12 +52,19 @@
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
                                      UINT wParam, LONG lParam );
 
-wxChar *wxTaskBarWindowClass = wxT("wxTaskBarWindowClass");
+wxChar *wxTaskBarWindowClass = (wxChar*) wxT("wxTaskBarWindowClass");
 
 wxList wxTaskBarIcon::sm_taskBarIcons;
 bool   wxTaskBarIcon::sm_registeredClass = FALSE;
 UINT   wxTaskBarIcon::sm_taskbarMsg = 0;
 
+DEFINE_EVENT_TYPE( wxEVT_TASKBAR_MOVE )
+DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DOWN )
+DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_UP )
+DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DOWN )
+DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_UP )
+DEFINE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DCLICK )
+DEFINE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DCLICK )
 
 BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
     EVT_TASKBAR_MOVE         (wxTaskBarIcon::_OnMouseMove)
@@ -173,7 +180,7 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
     wxGetMousePosition(&x, &y);
 
     // is wxFrame the best window type to use???
-    win = new wxFrame(NULL, -1, "", wxPoint(x,y), wxSize(-1,-1), 0);
+    win = new wxFrame(NULL, -1, wxEmptyString, wxPoint(x,y), wxSize(-1,-1), 0);
     win->PushEventHandler(this);
 
     // Remove from record of top-level windows, or will confuse wxWindows