X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ecee463f53424f00bf462e184ebc282ee3b995e..9696657f22ee2f10017c0bc305ae1843ee8fe768:/samples/taskbar/tbtest.h?ds=inline diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h index a2dc242b5a..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 @@ -34,7 +34,7 @@ public: // Define a new application -class MyApp: public wxApp +class MyApp : public wxApp { public: virtual bool OnInit(); @@ -43,19 +43,17 @@ public: 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(const wxString& title); virtual ~MyDialog(); protected: - void Init(); - + void OnAbout(wxCommandEvent& event); void OnOK(wxCommandEvent& event); void OnExit(wxCommandEvent& event); void OnCloseWindow(wxCloseEvent& event); MyTaskBarIcon *m_taskBarIcon; -#if defined(__WXCOCOA__) +#if defined(__WXOSX__) && wxOSX_USE_COCOA MyTaskBarIcon *m_dockIcon; #endif