X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a5593369fcb103c620246dda3d0cbaa40deb1d2c..9696657f22ee2f10017c0bc305ae1843ee8fe768:/samples/taskbar/tbtest.h?ds=sidebyside diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h index fdd2018edf..6c08b2ef87 100644 --- a/samples/taskbar/tbtest.h +++ b/samples/taskbar/tbtest.h @@ -9,10 +9,10 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -class MyTaskBarIcon: public wxTaskBarIcon +class MyTaskBarIcon : public wxTaskBarIcon { public: -#if defined(__WXCOCOA__) +#if defined(__WXOSX__) && wxOSX_USE_COCOA MyTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE) : wxTaskBarIcon(iconType) #else @@ -24,37 +24,38 @@ public: 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__) +#if defined(__WXOSX__) && wxOSX_USE_COCOA MyTaskBarIcon *m_dockIcon; #endif -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() };