X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d64396087f37acb856849381cc2cadc7c61c302f..51181d291194b7ae616cfb17c984fd8927e4a977:/include/wx/gtk/taskbarpriv.h

diff --git a/include/wx/gtk/taskbarpriv.h b/include/wx/gtk/taskbarpriv.h
index e2bb1da53b..242d3c6a89 100644
--- a/include/wx/gtk/taskbarpriv.h
+++ b/include/wx/gtk/taskbarpriv.h
@@ -9,19 +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"
-
-#ifdef __WXGTK20__
-#include <gtk/gtkversion.h>
-#if GTK_CHECK_VERSION(2, 1, 0)
 
 class WXDLLIMPEXP_ADV wxTaskBarIconAreaBase : public wxTopLevelWindow
 {
@@ -29,15 +20,14 @@ public:
     wxTaskBarIconAreaBase();
 
     // Returns true if SYSTRAY protocol is supported by the desktop
-    bool IsProtocolSupported();
-    
+    static 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 // __WXGTK20__
-#endif // GTK_CHECK_VERSION(2, 1, 0)
-#endif // _WX_TASKBARPRIV_H_
+#endif // _WX_GTK_TASKBARPRIV_H_