Changed the event handling to use events, instead of just virtual functions.
This is so wxPython can derive from the class. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,14 +17,15 @@
|
||||
#pragma interface "taskbar.h"
|
||||
#endif
|
||||
|
||||
#include <wx/event.h>
|
||||
#include <wx/list.h>
|
||||
#include <wx/icon.h>
|
||||
|
||||
class wxTaskBarIcon: public wxObject
|
||||
{
|
||||
class wxTaskBarIcon: public wxEvtHandler {
|
||||
DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
|
||||
public:
|
||||
wxTaskBarIcon(void);
|
||||
virtual ~wxTaskBarIcon(void);
|
||||
wxTaskBarIcon(void);
|
||||
virtual ~wxTaskBarIcon(void);
|
||||
|
||||
// Accessors
|
||||
inline WXHWND GetHWND() const { return m_hWnd; }
|
||||
@@ -36,13 +37,13 @@ public:
|
||||
bool RemoveIcon(void);
|
||||
|
||||
// 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);
|
||||
@@ -59,8 +60,33 @@ protected:
|
||||
static wxList sm_taskBarIcons;
|
||||
static bool sm_registeredClass;
|
||||
static unsigned int sm_taskbarMsg;
|
||||
|
||||
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_
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user