wx.aui.AUI_ART_GRADIENT_TYPE --> wx.aui.AUI_DOCKART_GRADIENT_TYPE

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

diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index 142ce5d237fe6ccb2df88cf5a098033a616acb96..0167ac662de94324902d93f1d7a46d070b74f395 100644 (file)
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -6,24 +6,29 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:
 /////////////////////////////////////////////////////////////////////////////
 
 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:

-       MyTaskBarIcon() {};
-
-    virtual void OnMouseMove(wxEvent&);
-    virtual void OnLButtonDown(wxEvent&);
-    virtual void OnLButtonUp(wxEvent&);
-    virtual void OnRButtonDown(wxEvent&);
-    virtual void OnRButtonUp(wxEvent&);
-    virtual void OnLButtonDClick(wxEvent&);
-    virtual void OnRButtonDClick(wxEvent&);
-
-    void OnMenuRestore(wxEvent&);
-    void OnMenuExit(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 OnMenuSetOldIcon(wxCommandEvent&);
+       void OnMenuCheckmark(wxCommandEvent&);
+       void OnMenuUICheckmark(wxUpdateUIEvent&);
+    void OnMenuSub(wxCommandEvent&);
+    virtual wxMenu *CreatePopupMenu();

 
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };


@@ -34,8 +39,6 @@ class MyApp: public wxApp
 {
 public:
     bool OnInit(void);
 {
 public:
     bool OnInit(void);

-protected:
-    MyTaskBarIcon   m_taskBarIcon;

 };
 
 class MyDialog: public wxDialog
 };
 
 class MyDialog: public wxDialog


@@ -43,13 +46,18 @@ 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);
 public:
     MyDialog(wxWindow* parent, const wxWindowID id, const wxString& title,
         const wxPoint& pos, const wxSize& size, const long windowStyle = wxDEFAULT_DIALOG_STYLE);

+    ~MyDialog();

 
     void OnOK(wxCommandEvent& event);
     void OnExit(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
     void Init(void);
 
 
     void OnOK(wxCommandEvent& event);
     void OnExit(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
     void Init(void);
 

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

 DECLARE_EVENT_TABLE()
 };
 DECLARE_EVENT_TABLE()
 };

-
-