Applied patch #809019 (Adds embedded/plugin capabilities to wxMac).

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

diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index 0184800270ef88ed3c595650e83fce9ed531e7b4..9aa9bd1b33117c17fc798b1e6fd1b1e89602adce 100644 (file)
--- a/include/wx/msw/taskbar.h
+++ b/include/wx/msw/taskbar.h
@@ -13,20 +13,21 @@
 #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;
+class WXDLLIMPEXP_ADV wxTaskBarIcon;
 
-WX_DECLARE_EXPORTED_LIST(wxTaskBarIcon, wxTaskBarIconList);
+WX_DECLARE_LIST_WITH_DECL(wxTaskBarIcon, wxTaskBarIconList,
+                          class WXDLLIMPEXP_ADV);
 
-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);
@@ -66,9 +67,10 @@ public:
 protected:
     WXHWND          m_hWnd;
     bool            m_iconAdded;
+    wxIcon          m_icon;
+    wxString        m_strTooltip;
+
     static wxTaskBarIconList sm_taskBarIcons;
-    static bool     sm_registeredClass;
-    static unsigned int sm_taskbarMsg;
 
 #if WXWIN_COMPATIBILITY_2_4
     // non-virtual default event handlers to forward events to the virtuals