Added min and max size to box attributes; made property editing more customisable

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

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index a7f523cced173195c58e8dfb8917d2820e729b61..326217eb8d35b7d9e91e38e787235292f8411c39 100644 (file)
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -32,7 +32,7 @@ public:
 #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
     static bool IsAvailable();
 #else
 #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
     static bool IsAvailable();
 #else

-    static bool IsAvailable() { return true; };
+    static bool IsAvailable() { return true; }

 #endif
 
     // Operations:
 #endif
 
     // Operations:


@@ -53,7 +53,7 @@ private:
     void OnRightButtonDown(wxTaskBarIconEvent& event);
 
     DECLARE_EVENT_TABLE()
     void OnRightButtonDown(wxTaskBarIconEvent& event);
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxTaskBarIconBase)
+    wxDECLARE_NO_COPY_CLASS(wxTaskBarIconBase);

 };
 
 
 };
 
 


@@ -61,10 +61,10 @@ private:
 // now include the actual class declaration
 // ----------------------------------------------------------------------------
 
 // now include the actual class declaration
 // ----------------------------------------------------------------------------
 

-#if defined(__WXPALMOS__)
-    #include "wx/palmos/taskbar.h"
-#elif defined(__WXMSW__)
+#if defined(__WXMSW__)

     #include "wx/msw/taskbar.h"
     #include "wx/msw/taskbar.h"

+#elif defined(__WXGTK20__)
+    #include "wx/gtk/taskbar.h"

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


@@ -89,23 +89,23 @@ public:
     virtual wxEvent *Clone() const { return new wxTaskBarIconEvent(*this); }
 
 private:
     virtual wxEvent *Clone() const { return new wxTaskBarIconEvent(*this); }
 
 private:

-    DECLARE_NO_ASSIGN_CLASS(wxTaskBarIconEvent)
+    wxDECLARE_NO_ASSIGN_CLASS(wxTaskBarIconEvent);

 };
 
 typedef void (wxEvtHandler::*wxTaskBarIconEventFunction)(wxTaskBarIconEvent&);
 
 };
 
 typedef void (wxEvtHandler::*wxTaskBarIconEventFunction)(wxTaskBarIconEvent&);
 

-extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_MOVE;
-extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_LEFT_DOWN;
-extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_LEFT_UP;
-extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_RIGHT_DOWN;
-extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_RIGHT_UP;
-extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_LEFT_DCLICK;
-extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_RIGHT_DCLICK;
-extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_BALLOON_TIMEOUT;
-extern WXDLLIMPEXP_ADV const wxEventType wxEVT_TASKBAR_BALLOON_CLICK;
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_MOVE, wxTaskBarIconEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_LEFT_DOWN, wxTaskBarIconEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_LEFT_UP, wxTaskBarIconEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_RIGHT_DOWN, wxTaskBarIconEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_RIGHT_UP, wxTaskBarIconEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_LEFT_DCLICK, wxTaskBarIconEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_RIGHT_DCLICK, wxTaskBarIconEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_BALLOON_TIMEOUT, wxTaskBarIconEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_TASKBAR_BALLOON_CLICK, wxTaskBarIconEvent );

 
 #define wxTaskBarIconEventHandler(func) \
 
 #define wxTaskBarIconEventHandler(func) \

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTaskBarIconEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxTaskBarIconEventFunction, func)

 
 #define wx__DECLARE_TASKBAREVT(evt, fn) \
     wx__DECLARE_EVT0(wxEVT_TASKBAR_ ## evt, wxTaskBarIconEventHandler(fn))
 
 #define wx__DECLARE_TASKBAREVT(evt, fn) \
     wx__DECLARE_EVT0(wxEVT_TASKBAR_ ## evt, wxTaskBarIconEventHandler(fn))