Renewed makefiles after reverting run-time lib change

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

diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index c67914d99861b3c293663aa768c8ddbc9b3001ac..a5674e56b1cf1dabcca94e415504b3c672c4eef7 100644 (file)
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -12,17 +12,20 @@
 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:
-    MyTaskBarIcon() {};
-
-#if WXWIN_COMPATIBILITY_2_4
-    void OnLButtonDClick(wxEvent&);
+#if defined(__WXCOCOA__)
+    MyTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE)
+    :   wxTaskBarIcon(iconType)
 #else
-    void OnLButtonDClick(wxTaskBarIconEvent&);
+    MyTaskBarIcon()
 #endif
+    {}
+
+    void OnLeftButtonDClick(wxTaskBarIconEvent&);
     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
     void OnMenuSetNewIcon(wxCommandEvent&);
-
+       void OnMenuCheckmark(wxCommandEvent&);
+       void OnMenuUICheckmark(wxUpdateUIEvent&);
     virtual wxMenu *CreatePopupMenu();
 
 DECLARE_EVENT_TABLE()
@@ -50,8 +53,9 @@ public:
 
 protected:
     MyTaskBarIcon   *m_taskBarIcon;
+#if defined(__WXCOCOA__)
+    MyTaskBarIcon   *m_dockIcon;
+#endif
 
 DECLARE_EVENT_TABLE()
 };
-
-