Add wxDataFormat GetMatchingPair() which wxGTK and wxMSW already had under different...

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

diff --git a/include/wx/gtk/taskbarpriv.h b/include/wx/gtk/taskbarpriv.h
index 4c76862609499d1df0ed0c85f67195c67dc7fa3d..242d3c6a8933209640efdc26dd5676bb80ed710e 100644 (file)
--- a/include/wx/gtk/taskbarpriv.h
+++ b/include/wx/gtk/taskbarpriv.h
@@ -9,15 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_TASKBARPRIV_H_
-#define _WX_TASKBARPRIV_H_
+#ifndef _WX_GTK_TASKBARPRIV_H_
+#define _WX_GTK_TASKBARPRIV_H_

 
 #include "wx/toplevel.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
 {
 
 class WXDLLIMPEXP_ADV wxTaskBarIconAreaBase : public wxTopLevelWindow
 {


@@ -25,15 +20,14 @@ public:
     wxTaskBarIconAreaBase();
 
     // Returns true if SYSTRAY protocol is supported by the desktop
     wxTaskBarIconAreaBase();
 
     // Returns true if SYSTRAY protocol is supported by the desktop

-    bool IsProtocolSupported();
-    
+    static bool IsProtocolSupported();
+

     wxEvtHandler *m_invokingWindow;
     wxEvtHandler *m_invokingWindow;

-    
+
+protected:

 #if wxUSE_MENUS_NATIVE
 #if wxUSE_MENUS_NATIVE

-    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
+    virtual void DoPopupMenuUpdateUI(wxMenu* menu);

 #endif // wxUSE_MENUS_NATIVE
 };
 
 #endif // wxUSE_MENUS_NATIVE
 };
 

-#endif // __WXGTK20__
-#endif // GTK_CHECK_VERSION(2, 1, 0)
-#endif // _WX_TASKBARPRIV_H_
+#endif // _WX_GTK_TASKBARPRIV_H_