X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/329fa15121b35e5a9ec805e027c5cfaaf4470674..1f6ea93556fb59e6d8f50af1f36ddb16b5a0dc33:/samples/taskbar/tbtest.h diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h index ee230b6ee3..df54f38dcf 100644 --- a/samples/taskbar/tbtest.h +++ b/samples/taskbar/tbtest.h @@ -9,43 +9,53 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -class MyTaskBarIcon: public wxTaskBarIcon +class MyTaskBarIcon : public wxTaskBarIcon { public: - MyTaskBarIcon() {}; +#if defined(__WXCOCOA__) + MyTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE) + : wxTaskBarIcon(iconType) +#else + MyTaskBarIcon() +#endif + {} void OnLeftButtonDClick(wxTaskBarIconEvent&); void OnMenuRestore(wxCommandEvent&); void OnMenuExit(wxCommandEvent&); void OnMenuSetNewIcon(wxCommandEvent&); - + void OnMenuCheckmark(wxCommandEvent&); + void OnMenuUICheckmark(wxUpdateUIEvent&); + void OnMenuSub(wxCommandEvent&); virtual wxMenu *CreatePopupMenu(); -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; // Define a new application -class MyApp: public wxApp +class MyApp : public wxApp { public: - bool OnInit(void); + virtual bool OnInit(); }; class MyDialog: public wxDialog { public: - MyDialog(wxWindow* parent, const wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, const long windowStyle = wxDEFAULT_DIALOG_STYLE); - ~MyDialog(); + MyDialog(const wxString& title); + virtual ~MyDialog(); +protected: + void OnAbout(wxCommandEvent& event); void OnOK(wxCommandEvent& event); void OnExit(wxCommandEvent& event); void OnCloseWindow(wxCloseEvent& event); - void Init(void); -protected: MyTaskBarIcon *m_taskBarIcon; +#if defined(__WXCOCOA__) + MyTaskBarIcon *m_dockIcon; +#endif -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() };