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 be2613b4cf195679f37d979c8f83bdec18158dfa..a5674e56b1cf1dabcca94e415504b3c672c4eef7 100644 (file)
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -2,7 +2,7 @@
 // Name:        tbtest.h
 // Purpose:     wxTaskBarIcon sample
 // Author:      Julian Smart
 // 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)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)


@@ -12,28 +12,20 @@
 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:
 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:

-    MyTaskBarIcon() {};
-
-    void OnLButtonDClick(wxTaskBarIconEvent&);
+#if defined(__WXCOCOA__)
+    MyTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE)
+    :   wxTaskBarIcon(iconType)
+#else
+    MyTaskBarIcon()
+#endif
+    {}
+
+    void OnLeftButtonDClick(wxTaskBarIconEvent&);

     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);

-

     void OnMenuSetNewIcon(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&);

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


@@ -61,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()

 };
 };

-
-