Made geometry class link.

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

diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index 4e0abf0d70bc8ba62909ff1478de33e8ab25a54b..966f030ee8cef45fe5f0b7eb02b60d8b99f627d1 100644 (file)
--- a/include/wx/msw/taskbar.h
+++ b/include/wx/msw/taskbar.h
@@ -21,7 +21,7 @@
 #include <wx/list.h>
 #include <wx/icon.h>
 
 #include <wx/list.h>
 #include <wx/icon.h>
 

-class wxTaskBarIcon: public wxEvtHandler {
+class WXDLLEXPORT wxTaskBarIcon: public wxEvtHandler {

     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 public:
     wxTaskBarIcon(void);
     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 public:
     wxTaskBarIcon(void);


@@ -35,6 +35,7 @@ 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
     virtual void OnMouseMove(wxEvent&);
 
 // Overridables
     virtual void OnMouseMove(wxEvent&);


@@ -61,7 +62,17 @@ protected:
     static bool     sm_registeredClass;
     static unsigned int sm_taskbarMsg;
 
     static bool     sm_registeredClass;
     static unsigned int sm_taskbarMsg;
 

-    DECLARE_EVENT_TABLE();
+    // 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()

 };
 
 
 };
 
 


@@ -83,6 +94,7 @@ const wxEventType wxEVT_TASKBAR_RIGHT_DCLICK =          wxEVT_FIRST + 1556;
 #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 },
 
 #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_