Move unused values into 2.4 compatibility. Source cleaning.

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

diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index c0b32f262ce12bb3ec2fdce5a864659bec4203bb..bb374a70c306fb9ee77cf10711ea8ed849583b07 100644 (file)
--- 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/list.h"
 #include "wx/icon.h"
 
-class wxTaskBarIcon;
+// private helper class:
+class WXDLLIMPEXP_ADV wxTaskBarIconWindow;
 
-WX_DECLARE_EXPORTED_LIST(wxTaskBarIcon, wxTaskBarIconList);
-
-class WXDLLEXPORT wxTaskBarIcon: public wxTaskBarIconBase
+class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
 {
-    DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
+    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
@@ -55,44 +52,35 @@ public:
 #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;
-    wxIcon          m_icon;
-    wxString        m_strTooltip;
-
-    static wxTaskBarIconList sm_taskBarIcons;
+    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
 };
 
-#if WXWIN_COMPATIBILITY_2_4    
+#if WXWIN_COMPATIBILITY_2_4
 inline bool wxTaskBarIcon::IsOK() const { return IsOk(); }
 #endif
 
 #endif
     // _TASKBAR_H_
-
-
-
-
-