porting reordering of controls back from 2.8

[wxWidgets.git] / include / wx / gtk / taskbarpriv.h

diff --git a/include/wx/gtk/taskbarpriv.h b/include/wx/gtk/taskbarpriv.h
index 03d2093f7e8ef92730831e28cc2b100356096885..f4bb0a27f8f020d73a3d16065ebec0420171bd6d 100644 (file)
--- a/include/wx/gtk/taskbarpriv.h
+++ b/include/wx/gtk/taskbarpriv.h
@@ -9,15 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_TASKBARPRIV_H_
-#define _WX_TASKBARPRIV_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "taskbarpriv.h"
-#endif
+#ifndef _WX_GTK_TASKBARPRIV_H_
+#define _WX_GTK_TASKBARPRIV_H_
 
 #include "wx/toplevel.h"
-#include "wx/bitmap.h"
 
 class WXDLLIMPEXP_ADV wxTaskBarIconAreaBase : public wxTopLevelWindow
 {
@@ -26,12 +21,13 @@ public:
 
     // Returns true if SYSTRAY protocol is supported by the desktop
     bool IsProtocolSupported();
-    
+
     wxEvtHandler *m_invokingWindow;
-    
+
+protected:
 #if wxUSE_MENUS_NATIVE
-    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
+    virtual void DoPopupMenuUpdateUI(wxMenu* menu);
 #endif // wxUSE_MENUS_NATIVE
 };
 
-#endif // _WX_TASKBARPRIV_H_
+#endif // _WX_GTK_TASKBARPRIV_H_