Removed unnecessary code from utilsunx.cpp

[wxWidgets.git] / include / wx / msw / taskbar.h

diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index 36703ce96d686309d1277a9573a1f1332013b840..966f030ee8cef45fe5f0b7eb02b60d8b99f627d1 100644 (file)
--- a/include/wx/msw/taskbar.h
+++ b/include/wx/msw/taskbar.h
@@ -17,14 +17,15 @@
 #pragma interface "taskbar.h"
 #endif
 
 #pragma interface "taskbar.h"
 #endif
 

+#include <wx/event.h>

 #include <wx/list.h>
 #include <wx/icon.h>
 
 #include <wx/list.h>
 #include <wx/icon.h>
 

-class wxTaskBarIcon: public wxObject
-{
+class WXDLLEXPORT wxTaskBarIcon: public wxEvtHandler {
+    DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)

 public:
 public:

-       wxTaskBarIcon(void);
-       virtual ~wxTaskBarIcon(void);
+    wxTaskBarIcon(void);
+    virtual ~wxTaskBarIcon(void);

 
 // Accessors
     inline WXHWND GetHWND() const { return m_hWnd; }
 
 // Accessors
     inline WXHWND GetHWND() const { return m_hWnd; }


@@ -34,15 +35,16 @@ public:
 // Operations
     bool SetIcon(const wxIcon& icon, const wxString& tooltip = "");
     bool RemoveIcon(void);
 // Operations
     bool SetIcon(const wxIcon& icon, const wxString& tooltip = "");
     bool RemoveIcon(void);

+    bool PopupMenu(wxMenu *menu); //, int x, int y);

 
 // Overridables
 
 // Overridables

-    virtual void OnMouseMove(void);
-    virtual void OnLButtonDown(void);
-    virtual void OnLButtonUp(void);
-    virtual void OnRButtonDown(void);
-    virtual void OnRButtonUp(void);
-    virtual void OnLButtonDClick(void);
-    virtual void OnRButtonDClick(void);
+    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&);

 
 // Implementation
     static wxTaskBarIcon* FindObjectForHWND(WXHWND hWnd);
 
 // Implementation
     static wxTaskBarIcon* FindObjectForHWND(WXHWND hWnd);


@@ -59,8 +61,44 @@ protected:
     static wxList   sm_taskBarIcons;
     static bool     sm_registeredClass;
     static unsigned int sm_taskbarMsg;
     static wxList   sm_taskBarIcons;
     static bool     sm_registeredClass;
     static unsigned int sm_taskbarMsg;

+
+    // non-virtual default event handlers to forward events to the virtuals
+    void _OnMouseMove(wxEvent&);
+    void _OnLButtonDown(wxEvent&);
+    void _OnLButtonUp(wxEvent&);
+    void _OnRButtonDown(wxEvent&);
+    void _OnRButtonUp(wxEvent&);
+    void _OnLButtonDClick(wxEvent&);
+    void _OnRButtonDClick(wxEvent&);
+
+
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

+
+
+const wxEventType wxEVT_TASKBAR_MOVE =                  wxEVT_FIRST + 1550;
+const wxEventType wxEVT_TASKBAR_LEFT_DOWN =             wxEVT_FIRST + 1551;
+const wxEventType wxEVT_TASKBAR_LEFT_UP =               wxEVT_FIRST + 1552;
+const wxEventType wxEVT_TASKBAR_RIGHT_DOWN =            wxEVT_FIRST + 1553;
+const wxEventType wxEVT_TASKBAR_RIGHT_UP =              wxEVT_FIRST + 1554;
+const wxEventType wxEVT_TASKBAR_LEFT_DCLICK =           wxEVT_FIRST + 1555;
+const wxEventType wxEVT_TASKBAR_RIGHT_DCLICK =          wxEVT_FIRST + 1556;
+
+
+#define EVT_TASKBAR_MOVE(fn)         { wxEVT_TASKBAR_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL },
+#define EVT_TASKBAR_LEFT_DOWN(fn)    { wxEVT_TASKBAR_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL },
+#define EVT_TASKBAR_LEFT_UP(fn)      { wxEVT_TASKBAR_LEFT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL },
+#define EVT_TASKBAR_RIGHT_DOWN(fn)   { wxEVT_TASKBAR_RIGHT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL },
+#define EVT_TASKBAR_RIGHT_UP(fn)     { wxEVT_TASKBAR_RIGHT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL },
+#define EVT_TASKBAR_LEFT_DCLICK(fn)  { wxEVT_TASKBAR_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL },
+#define EVT_TASKBAR_RIGHT_DCLICK(fn) { wxEVT_TASKBAR_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL },
+
+

 #endif
     // _TASKBAR_H_
 
 #endif
     // _TASKBAR_H_
 

+
+
+
+