X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a42b93aaade954a1ae5aea72153865a862a1d9d2..f6def1fae7f76d4fe352c641ead088b2cb95e91d:/samples/taskbar/tbtest.h?ds=sidebyside

diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index b25defd713..b4862386b6 100644
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -6,24 +6,20 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 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&);
+    MyTaskBarIcon() {};
 
+    void OnLButtonDClick(wxTaskBarIconEvent&);
     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
+    void OnMenuSetNewIcon(wxCommandEvent&);
+
+    virtual wxMenu *CreatePopupMenu();
 
 DECLARE_EVENT_TABLE()
 };
@@ -34,8 +30,6 @@ class MyApp: public wxApp
 {
 public:
     bool OnInit(void);
-protected:
-    MyTaskBarIcon   m_taskBarIcon;
 };
 
 class MyDialog: public wxDialog
@@ -43,12 +37,16 @@ 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);
+    ~MyDialog();
 
     void OnOK(wxCommandEvent& event);
     void OnExit(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
     void Init(void);
 
+protected:
+    MyTaskBarIcon   *m_taskBarIcon;
+
 DECLARE_EVENT_TABLE()
 };