X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d162a7ee7d6bab3d0c714b865806377aeb5d0d9e..e951b8e4e6c07fe5d5200b8cbf6148e7317aa0e5:/include/wx/msw/taskbar.h

diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index b6fccfa2c4..bb374a70c3 100644
--- a/include/wx/msw/taskbar.h
+++ b/include/wx/msw/taskbar.h
@@ -3,7 +3,7 @@
 // Purpose:     Defines wxTaskBarIcon class for manipulating icons on the
 //              Windows task bar.
 // Author:      Julian Smart
-// Modified by:
+// Modified by: Vaclav Slavik
 // Created:     24/3/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
@@ -13,27 +13,24 @@
 #ifndef _TASKBAR_H_
 #define _TASKBAR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "taskbar.h"
 #endif
 
-#include "wx/event.h"
-#include "wx/list.h"
 #include "wx/icon.h"
 
-class wxTaskBarIcon;
+// private helper class:
+class WXDLLIMPEXP_ADV wxTaskBarIconWindow;
 
-WX_DECLARE_LIST(wxTaskBarIcon, wxTaskBarIconList);
-
-class WXDLLEXPORT wxTaskBarIcon: public wxEvtHandler {
-    DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
+class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
+{
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
 public:
-    wxTaskBarIcon(void);
-    virtual ~wxTaskBarIcon(void);
+    wxTaskBarIcon();
+    virtual ~wxTaskBarIcon();
 
 // Accessors
-    inline WXHWND GetHWND() const { return m_hWnd; }
-    inline bool IsOK() const { return (m_hWnd != 0) ; }
+    inline bool IsOk() const { return true; }
     inline bool IsIconInstalled() const { return m_iconAdded; }
 
 // Operations
@@ -41,6 +38,9 @@ public:
     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&);
@@ -49,76 +49,38 @@ public:
     virtual void OnRButtonUp(wxEvent&);
     virtual void OnLButtonDClick(wxEvent&);
     virtual void OnRButtonDClick(wxEvent&);
+#endif
 
 // Implementation
-    static wxTaskBarIcon* FindObjectForHWND(WXHWND hWnd);
-    static void AddObject(wxTaskBarIcon* obj);
-    static void RemoveObject(wxTaskBarIcon* obj);
-    static bool RegisterWindowClass();
-    static WXHWND CreateTaskBarWindow();
-    long WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wParam, long lParam );
+protected:
+    friend class wxTaskBarIconWindow;
+    long WindowProc(unsigned int msg, unsigned int wParam, long lParam);
+    void RegisterWindowMessages();
 
 // Data members
 protected:
-    WXHWND          m_hWnd;
-    bool            m_iconAdded;
-    static wxTaskBarIconList sm_taskBarIcons;
-    static bool     sm_registeredClass;
-    static unsigned int sm_taskbarMsg;
+    wxTaskBarIconWindow *m_win;
+    bool                 m_iconAdded;
+    wxIcon               m_icon;
+    wxString             m_strTooltip;
 
+#if WXWIN_COMPATIBILITY_2_4
     // 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&);
-
+    void _OnMouseMove(wxTaskBarIconEvent&);
+    void _OnLButtonDown(wxTaskBarIconEvent&);
+    void _OnLButtonUp(wxTaskBarIconEvent&);
+    void _OnRButtonDown(wxTaskBarIconEvent&);
+    void _OnRButtonUp(wxTaskBarIconEvent&);
+    void _OnLButtonDClick(wxTaskBarIconEvent&);
+    void _OnRButtonDClick(wxTaskBarIconEvent&);
 
     DECLARE_EVENT_TABLE()
+#endif
 };
 
-
-// ----------------------------------------------------------------------------
-// wxTaskBarIcon events
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxTaskBarIconEvent : public wxEvent
-{
-public:
-    wxTaskBarIconEvent(wxEventType evtType, wxTaskBarIcon *tbIcon)
-        : wxEvent(-1, evtType)
-        {
-            SetEventObject(tbIcon);
-        }
-
-    virtual wxEvent *Clone() const { return new wxTaskBarIconEvent(*this); }
-};
-
-BEGIN_DECLARE_EVENT_TYPES()
-DECLARE_EVENT_TYPE( wxEVT_TASKBAR_MOVE, 1550 )
-DECLARE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DOWN, 1551 )
-DECLARE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_UP, 1552 )
-DECLARE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DOWN, 1553 )
-DECLARE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_UP, 1554 )
-DECLARE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DCLICK, 1555 )
-DECLARE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DCLICK, 1556 )
-END_DECLARE_EVENT_TYPES()
-
-#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_
-
-
-
-
-