fix monodll build

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

diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index bb3a9db3f55cb82b6b9192157217868ffa75f689..c0b32f262ce12bb3ec2fdce5a864659bec4203bb 100644 (file)
--- a/include/wx/msw/taskbar.h
+++ b/include/wx/msw/taskbar.h
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////

-// File:        taskbar.h
-// Purpose:        Defines wxTaskBarIcon class for manipulating icons on the
+// File:        wx/msw/taskbar.h
+// Purpose:     Defines wxTaskBarIcon class for manipulating icons on the

 //              Windows task bar.
 // Author:      Julian Smart
 // Modified by:
 // Created:     24/3/98
 // RCS-ID:      $Id$
 //              Windows task bar.
 // Author:      Julian Smart
 // Modified by:
 // Created:     24/3/98
 // RCS-ID:      $Id$

-// Copyright:   (c)
-// Licence:    wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////
 
 #ifndef _TASKBAR_H_
 /////////////////////////////////////////////////////////////////////////
 
 #ifndef _TASKBAR_H_


@@ -17,11 +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 WXDLLEXPORT wxTaskBarIcon: public wxEvtHandler {
+class wxTaskBarIcon;
+
+WX_DECLARE_EXPORTED_LIST(wxTaskBarIcon, wxTaskBarIconList);
+
+class WXDLLEXPORT wxTaskBarIcon: public wxTaskBarIconBase
+{

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


@@ -29,14 +33,17 @@ public:
 
 // Accessors
     inline WXHWND GetHWND() const { return m_hWnd; }
 
 // Accessors
     inline WXHWND GetHWND() const { return m_hWnd; }

-    inline bool IsOK() const { return (m_hWnd != 0) ; }
+    inline bool IsOk() const { return (m_hWnd != 0) ; }

     inline bool IsIconInstalled() const { return m_iconAdded; }
 
 // Operations
     inline bool IsIconInstalled() const { return m_iconAdded; }
 
 // Operations

-    bool SetIcon(const wxIcon& icon, const wxString& tooltip = "");
+    bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);

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

+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( bool IsOK() const );
+

 // Overridables
     virtual void OnMouseMove(wxEvent&);
     virtual void OnLButtonDown(wxEvent&);
 // Overridables
     virtual void OnMouseMove(wxEvent&);
     virtual void OnLButtonDown(wxEvent&);


@@ -45,6 +52,7 @@ public:
     virtual void OnRButtonUp(wxEvent&);
     virtual void OnLButtonDClick(wxEvent&);
     virtual void OnRButtonDClick(wxEvent&);
     virtual void OnRButtonUp(wxEvent&);
     virtual void OnLButtonDClick(wxEvent&);
     virtual void OnRButtonDClick(wxEvent&);

+#endif

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


@@ -58,10 +66,12 @@ public:
 protected:
     WXHWND          m_hWnd;
     bool            m_iconAdded;
 protected:
     WXHWND          m_hWnd;
     bool            m_iconAdded;

-    static wxList   sm_taskBarIcons;
-    static bool     sm_registeredClass;
-    static unsigned int sm_taskbarMsg;
+    wxIcon          m_icon;
+    wxString        m_strTooltip;

 
 

+    static wxTaskBarIconList sm_taskBarIcons;
+
+#if WXWIN_COMPATIBILITY_2_4

     // non-virtual default event handlers to forward events to the virtuals
     void _OnMouseMove(wxEvent&);
     void _OnLButtonDown(wxEvent&);
     // non-virtual default event handlers to forward events to the virtuals
     void _OnMouseMove(wxEvent&);
     void _OnLButtonDown(wxEvent&);


@@ -71,29 +81,13 @@ protected:
     void _OnLButtonDClick(wxEvent&);
     void _OnRButtonDClick(wxEvent&);
 
     void _OnLButtonDClick(wxEvent&);
     void _OnRButtonDClick(wxEvent&);
 

-

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+#endif

 };
 
 };
 

-
-
-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)         DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
-#define EVT_TASKBAR_LEFT_DOWN(fn)    DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
-#define EVT_TASKBAR_LEFT_UP(fn)      DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_LEFT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
-#define EVT_TASKBAR_RIGHT_DOWN(fn)   DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_RIGHT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
-#define EVT_TASKBAR_RIGHT_UP(fn)     DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_RIGHT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
-#define EVT_TASKBAR_LEFT_DCLICK(fn)  DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
-#define EVT_TASKBAR_RIGHT_DCLICK(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
-
+#if WXWIN_COMPATIBILITY_2_4    
+inline bool wxTaskBarIcon::IsOK() const { return IsOk(); }
+#endif

 
 #endif
     // _TASKBAR_H_
 
 #endif
     // _TASKBAR_H_