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 24ab1de7c8fce69ebc19de0b0f64bf8f0b0d0f13..a5674e56b1cf1dabcca94e415504b3c672c4eef7 100644 (file)
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -12,13 +12,21 @@
 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:
 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:

-    MyTaskBarIcon() {};
-
-    void OnRButtonUp(wxEvent&);
-    void OnLButtonDClick(wxEvent&);
+#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 OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
     void OnMenuSetNewIcon(wxCommandEvent&);

+       void OnMenuCheckmark(wxCommandEvent&);
+       void OnMenuUICheckmark(wxUpdateUIEvent&);
+    virtual wxMenu *CreatePopupMenu();

 
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };


@@ -45,8 +53,9 @@ public:
 
 protected:
     MyTaskBarIcon   *m_taskBarIcon;
 
 protected:
     MyTaskBarIcon   *m_taskBarIcon;

+#if defined(__WXCOCOA__)
+    MyTaskBarIcon   *m_dockIcon;
+#endif

 
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };

-
-