Fix a crash in wxExecute() in wxMSW too.

[wxWidgets.git] / samples / taskbar / tbtest.h

diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index be2613b4cf195679f37d979c8f83bdec18158dfa..d667df9186fc8d923a3f431b888ce6509915586f 100644 (file)
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -2,67 +2,60 @@
 // Name:        tbtest.h
 // Purpose:     wxTaskBarIcon sample
 // Author:      Julian Smart
-// Modified by: Ryan Norton (OSX 10.2+ Drawer)
+// Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-class MyTaskBarIcon: public wxTaskBarIcon
+class MyTaskBarIcon : public wxTaskBarIcon
 {
 public:
-    MyTaskBarIcon() {};
-
-    void OnLButtonDClick(wxTaskBarIconEvent&);
+#if defined(__WXOSX__) && wxOSX_USE_COCOA
+    MyTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE)
+    :   wxTaskBarIcon(iconType)
+#else
+    MyTaskBarIcon()
+#endif
+    {}
+
+    void OnLeftButtonDClick(wxTaskBarIconEvent&);
     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
-
     void OnMenuSetNewIcon(wxCommandEvent&);
-    void OnMenuSetOldIcon(wxCommandEvent&);
-
-#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
-    class MyDrawer* m_pMyDrawer;
-    MyTaskBarIcon(class MyDrawer* p) {m_pMyDrawer = p;}
-
-    void OnMenuOpenDrawer(wxCommandEvent&);
-    void OnMenuCloseDrawer(wxCommandEvent&);
-
-    void OnMenuLeftDrawer(wxCommandEvent&);
-    void OnMenuRightDrawer(wxCommandEvent&);
-    void OnMenuTopDrawer(wxCommandEvent&);
-    void OnMenuBottomDrawer(wxCommandEvent&);
-#endif //10.2+
-
+    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(__WXOSX__) && wxOSX_USE_COCOA
+    MyTaskBarIcon   *m_dockIcon;
+#endif
 
     DECLARE_EVENT_TABLE()
 };
-
-