Comitted GTK part of clipboard patch, that

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

diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index 36703ce96d686309d1277a9573a1f1332013b840..9aa9bd1b33117c17fc798b1e6fd1b1e89602adce 100644 (file)
--- a/include/wx/msw/taskbar.h
+++ b/include/wx/msw/taskbar.h
@@ -1,48 +1,59 @@
 /////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////

-// 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_
 #define _TASKBAR_H_
 
 /////////////////////////////////////////////////////////////////////////
 
 #ifndef _TASKBAR_H_
 #define _TASKBAR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "taskbar.h"
 #endif
 
 #pragma interface "taskbar.h"
 #endif
 

-#include <wx/list.h>
-#include <wx/icon.h>
+#include "wx/list.h"
+#include "wx/icon.h"

 
 

-class wxTaskBarIcon: public wxObject
+class WXDLLIMPEXP_ADV wxTaskBarIcon;
+
+WX_DECLARE_LIST_WITH_DECL(wxTaskBarIcon, wxTaskBarIconList,
+                          class WXDLLIMPEXP_ADV);
+
+class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase

 {
 {

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)

 public:
 public:

-       wxTaskBarIcon(void);
-       virtual ~wxTaskBarIcon(void);
+    wxTaskBarIcon(void);
+    virtual ~wxTaskBarIcon(void);

 
 // 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 RemoveIcon(void);

+    bool PopupMenu(wxMenu *menu); //, int x, int y);
+
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( bool IsOK() const );

 
 // Overridables
 
 // 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&);
+#endif

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


@@ -56,11 +67,33 @@ 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&);
+    void _OnLButtonUp(wxEvent&);
+    void _OnRButtonDown(wxEvent&);
+    void _OnRButtonUp(wxEvent&);
+    void _OnLButtonDClick(wxEvent&);
+    void _OnRButtonDClick(wxEvent&);
+
+    DECLARE_EVENT_TABLE()
+#endif

 };
 
 };
 

+#if WXWIN_COMPATIBILITY_2_4    
+inline bool wxTaskBarIcon::IsOK() const { return IsOk(); }
+#endif
+

 #endif
     // _TASKBAR_H_
 
 #endif
     // _TASKBAR_H_
 

+
+
+
+