blind OS/2 compilation fix in wxSetWorkingDirectory()

[wxWidgets.git] / src / unix / taskbarx11.cpp

diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index f95165004a7c34fb78ec29d3e14083aa49e23f97..c335b5d7af8cb777048571a1288da0faab813944 100644 (file)
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -21,19 +21,20 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_TASKBARICON
+

 #include "wx/taskbar.h"
 
 #ifndef  WX_PRECOMP
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/dcclient.h"
 #include "wx/taskbar.h"
 
 #ifndef  WX_PRECOMP
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/dcclient.h"

+    #include "wx/statbmp.h"
+    #include "wx/sizer.h"
+    #include "wx/bitmap.h"
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/bitmap.h"
-#include "wx/statbmp.h"
-#include "wx/sizer.h"
-#include "wx/image.h"
-

 #ifdef __VMS
 #pragma message disable nosimpint
 #endif
 #ifdef __VMS
 #pragma message disable nosimpint
 #endif


@@ -118,7 +119,7 @@ protected:
 BEGIN_EVENT_TABLE(wxTaskBarIconArea, wxTaskBarIconAreaBase)
     EVT_SIZE(wxTaskBarIconArea::OnSizeChange)
     EVT_MOUSE_EVENTS(wxTaskBarIconArea::OnMouseEvent)
 BEGIN_EVENT_TABLE(wxTaskBarIconArea, wxTaskBarIconAreaBase)
     EVT_SIZE(wxTaskBarIconArea::OnSizeChange)
     EVT_MOUSE_EVENTS(wxTaskBarIconArea::OnMouseEvent)

-    EVT_MENU(-1, wxTaskBarIconArea::OnMenuEvent)
+    EVT_MENU(wxID_ANY, wxTaskBarIconArea::OnMenuEvent)

     EVT_PAINT(wxTaskBarIconArea::OnPaint)
 END_EVENT_TABLE()
 
     EVT_PAINT(wxTaskBarIconArea::OnPaint)
 END_EVENT_TABLE()
 


@@ -326,3 +327,5 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
     m_iconWnd->PopupMenu(menu);
     return true;
 }
     m_iconWnd->PopupMenu(menu);
     return true;
 }

+
+#endif // wxUSE_TASKBARICON