wxSystemSettings::GetMetric returns -1 if the metric is not supported

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

diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index 142ce5d237fe6ccb2df88cf5a098033a616acb96..ee230b6ee3ce8f99d1c2b58277618e1773c66982 100644 (file)
--- 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() {};
+    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 OnLeftButtonDClick(wxTaskBarIconEvent&);
+    void OnMenuRestore(wxCommandEvent&);
+    void OnMenuExit(wxCommandEvent&);
+    void OnMenuSetNewIcon(wxCommandEvent&);
 
-    void OnMenuRestore(wxEvent&);
-    void OnMenuExit(wxEvent&);
+    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,13 +37,15 @@ 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()
 };
-
-