X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b11752c4f9e1fd4b11ba3d184246267facb3ad3..c0430d964dca888a28eff26436e6360a7b79b65f:/include/wx/taskbar.h diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h index b67607bbe4..326217eb8d 100644 --- 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 - static bool IsAvailable() { return true; }; + static bool IsAvailable() { return true; } #endif // Operations: @@ -53,7 +53,7 @@ private: 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 // ---------------------------------------------------------------------------- -#if defined(__WXPALMOS__) - #include "wx/palmos/taskbar.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #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__) @@ -89,7 +89,7 @@ public: virtual wxEvent *Clone() const { return new wxTaskBarIconEvent(*this); } private: - DECLARE_NO_ASSIGN_CLASS(wxTaskBarIconEvent) + wxDECLARE_NO_ASSIGN_CLASS(wxTaskBarIconEvent); }; typedef void (wxEvtHandler::*wxTaskBarIconEventFunction)(wxTaskBarIconEvent&);