applied heavily modified patch 1116702: support for specifying disabled toolbar image...

[wxWidgets.git] / include / wx / unix / taskbarx11.h

diff --git a/include/wx/unix/taskbarx11.h b/include/wx/unix/taskbarx11.h
index 0c924b7b78a224b59883b8ef304065c95cdd1863..fb2aeb776301d46ea83c14fcf42d27337f6cd49c 100644 (file)
--- a/include/wx/unix/taskbarx11.h
+++ b/include/wx/unix/taskbarx11.h
@@ -12,7 +12,7 @@
 #ifndef _TASKBAR_H_
 #define _TASKBAR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "taskbarx11.h"
 #endif
 
@@ -20,7 +20,9 @@ class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
 
-class WXDLLEXPORT wxTaskBarIcon: public wxTaskBarIconBase
+class WXDLLIMPEXP_ADV wxTaskBarIconArea;
+
+class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
 {
 public:
     wxTaskBarIcon();
@@ -36,8 +38,7 @@ public:
     bool PopupMenu(wxMenu *menu);
 
 protected:
-    wxFrame *m_iconWnd;
-    wxWindow *m_iconArea;
+    wxTaskBarIconArea *m_iconWnd;
 
     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 };