compilation fixed for wxDataViewCtrl: almost no class was properly exported in wxGTK...

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

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index 799792b7bb812215f62efad2f5aecb593fac4c04..6925331730da0ea1e8123547b3bdd7dac0dc02fc 100644 (file)
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -14,7 +14,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#ifdef wxHAS_TASK_BAR_ICON
+#if wxUSE_TASKBARICON

 
 #include "wx/event.h"
 
 
 #include "wx/event.h"
 


@@ -35,6 +35,9 @@ public:
     virtual bool RemoveIcon() = 0;
     virtual bool PopupMenu(wxMenu *menu) = 0;
 
     virtual bool RemoveIcon() = 0;
     virtual bool PopupMenu(wxMenu *menu) = 0;
 

+    // delayed destruction (similarly to wxWindow::Destroy())
+    void Destroy();
+

 protected:
     // creates menu to be displayed when user clicks on the icon
     virtual wxMenu *CreatePopupMenu() { return NULL; }
 protected:
     // creates menu to be displayed when user clicks on the icon
     virtual wxMenu *CreatePopupMenu() { return NULL; }


@@ -119,6 +122,6 @@ END_DECLARE_EVENT_TYPES()
 #endif
 #define EVT_TASKBAR_CLICK(fn)        wx__DECLARE_TASKBAREVT(CLICK, fn)
 
 #endif
 #define EVT_TASKBAR_CLICK(fn)        wx__DECLARE_TASKBAREVT(CLICK, fn)
 

-#endif // wxHAS_TASK_BAR_ICON
+#endif // wxUSE_TASKBARICON

 
 #endif // _WX_TASKBAR_H_BASE_
 
 #endif // _WX_TASKBAR_H_BASE_