Minor corrections to native renderer. I also corrected

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

diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index b5f1760723805dd858cc52fd5e17588ea804480a..0167ac662de94324902d93f1d7a46d070b74f395 100644 (file)
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -12,13 +12,22 @@
 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:
 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:

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

-
+    void OnMenuSetOldIcon(wxCommandEvent&);
+       void OnMenuCheckmark(wxCommandEvent&);
+       void OnMenuUICheckmark(wxUpdateUIEvent&);
+    void OnMenuSub(wxCommandEvent&);

     virtual wxMenu *CreatePopupMenu();
 
 DECLARE_EVENT_TABLE()
     virtual wxMenu *CreatePopupMenu();
 
 DECLARE_EVENT_TABLE()


@@ -46,8 +55,9 @@ public:
 
 protected:
     MyTaskBarIcon   *m_taskBarIcon;
 
 protected:
     MyTaskBarIcon   *m_taskBarIcon;

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

 
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };

-
-