more backwards compatible kbd handling in wxScrolledWindow

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 89246bd8a2ac1fd124767c2fd33d4281c7274e55..cc82231d233cc9d7691913d6fff48827a0c773c6 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -32,14 +32,17 @@
 #if defined(__WIN95__) && !defined(__TWIN32__)
 
 #include <windows.h>
+
+#include "wx/msw/winundef.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
@@ -58,7 +61,6 @@ 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 +73,6 @@ END_EVENT_TABLE()
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
-#endif
 
 
 wxTaskBarIcon::wxTaskBarIcon(void)