make it possible to use wxConsoleApp in GUI build

[wxWidgets.git] / include / wx / taskbar.h

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index fc989414c4decaf107c377f66e7bed4e2f90c0e0..1e5e4d81e9def984d8aebfa9fe1e81b13b0c58a6 100644 (file)
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -1,6 +1,10 @@
 #ifndef _WX_TASKBAR_H_BASE_
 #define _WX_TASKBAR_H_BASE_
 
 #ifndef _WX_TASKBAR_H_BASE_
 #define _WX_TASKBAR_H_BASE_
 

+#include "wx/defs.h"
+
+#ifdef wxHAS_TASK_BAR_ICON
+

 #include "wx/event.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/event.h"
 
 // ----------------------------------------------------------------------------


@@ -9,6 +13,11 @@
 
 class WXDLLEXPORT wxTaskBarIconBase : public wxEvtHandler
 {
 
 class WXDLLEXPORT wxTaskBarIconBase : public wxEvtHandler
 {

+public:
+    wxTaskBarIconBase() { }
+
+private:
+    DECLARE_NO_COPY_CLASS(wxTaskBarIconBase)

 };
 
 
 };
 
 


@@ -18,9 +27,10 @@ class WXDLLEXPORT wxTaskBarIconBase : public wxEvtHandler
 
 #if defined(__WXMSW__)
     #include "wx/msw/taskbar.h"
 
 #if defined(__WXMSW__)
     #include "wx/msw/taskbar.h"

+#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
+    #include "wx/unix/taskbarx11.h"

 #endif
 
 #endif
 

-

 // ----------------------------------------------------------------------------
 // wxTaskBarIcon events
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTaskBarIcon events
 // ----------------------------------------------------------------------------


@@ -35,6 +45,9 @@ public:
     }
 
     virtual wxEvent *Clone() const { return new wxTaskBarIconEvent(*this); }
     }
 
     virtual wxEvent *Clone() const { return new wxTaskBarIconEvent(*this); }

+
+private:
+    DECLARE_NO_ASSIGN_CLASS(wxTaskBarIconEvent)

 };
 
 BEGIN_DECLARE_EVENT_TYPES()
 };
 
 BEGIN_DECLARE_EVENT_TYPES()


@@ -55,5 +68,8 @@ END_DECLARE_EVENT_TYPES()
 #define EVT_TASKBAR_LEFT_DCLICK(fn)  DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
 #define EVT_TASKBAR_RIGHT_DCLICK(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
 
 #define EVT_TASKBAR_LEFT_DCLICK(fn)  DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
 #define EVT_TASKBAR_RIGHT_DCLICK(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
 

+#endif
+    // wxHAS_TASK_BAR_ICON
+

 #endif
     // _WX_TASKBAR_H_BASE_
 #endif
     // _WX_TASKBAR_H_BASE_