wxUniv: implement wxSYS_VSCROLL_X/Y metrics in wxUniv code, they depend on the theme...

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

diff --git a/include/wx/unix/taskbarx11.h b/include/wx/unix/taskbarx11.h
index ce9b661a85b1dcc8c150ed64a99e20f1b4bda09e..f7d8589a136e0e65dbf4577e2ec49ae9ee2ae286 100644 (file)
--- a/include/wx/unix/taskbarx11.h
+++ b/include/wx/unix/taskbarx11.h
@@ -12,15 +12,13 @@
 #ifndef _TASKBAR_H_
 #define _TASKBAR_H_
 
 #ifndef _TASKBAR_H_
 #define _TASKBAR_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "taskbarx11.h"
-#endif
+class WXDLLIMPEXP_FWD_CORE wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 

-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_ADV wxTaskBarIconArea;

 
 

-class WXDLLEXPORT wxTaskBarIcon: public wxTaskBarIconBase
+class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase

 {
 public:
     wxTaskBarIcon();
 {
 public:
     wxTaskBarIcon();


@@ -36,8 +34,10 @@ public:
     bool PopupMenu(wxMenu *menu);
 
 protected:
     bool PopupMenu(wxMenu *menu);
 
 protected:

-    wxFrame *m_iconWnd;
-    wxWindow *m_iconArea;
+    wxTaskBarIconArea *m_iconWnd;
+
+private:
+    void OnDestroy(wxWindowDestroyEvent&);

 
     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 };
 
     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 };