another DMC build fix (http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/93155)

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

diff --git a/include/wx/gtk/taskbarpriv.h b/include/wx/gtk/taskbarpriv.h
index 03d2093f7e8ef92730831e28cc2b100356096885..58a43819523273291455b328ade0a440f5687361 100644 (file)
--- a/include/wx/gtk/taskbarpriv.h
+++ b/include/wx/gtk/taskbarpriv.h
@@ -9,15 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
 // 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/toplevel.h"

-#include "wx/bitmap.h"
+
+#include <gtk/gtkversion.h>
+#if GTK_CHECK_VERSION(2, 1, 0)

 
 class WXDLLIMPEXP_ADV wxTaskBarIconAreaBase : public wxTopLevelWindow
 {
 
 class WXDLLIMPEXP_ADV wxTaskBarIconAreaBase : public wxTopLevelWindow
 {


@@ -26,12 +24,16 @@ public:
 
     // Returns true if SYSTRAY protocol is supported by the desktop
     bool IsProtocolSupported();
 
     // Returns true if SYSTRAY protocol is supported by the desktop
     bool IsProtocolSupported();

-    
+
+    virtual bool IsDecorCacheable() const;
+

     wxEvtHandler *m_invokingWindow;
     wxEvtHandler *m_invokingWindow;

-    
+
+protected:

 #if wxUSE_MENUS_NATIVE
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 #endif // wxUSE_MENUS_NATIVE
 };
 
 #if wxUSE_MENUS_NATIVE
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 #endif // wxUSE_MENUS_NATIVE
 };
 

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