applied heavily modified patch 1116702: support for specifying disabled toolbar image...

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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index 7c46a9dc340260fbd37937eda1d99625f519d66c..ce7840158819c6089e7a05738f5f924d1f718c61 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -10,7 +10,7 @@
 #ifndef _WX_GTK_TBARGTK_H_
 #define _WX_GTK_TBARGTK_H_
 
 #ifndef _WX_GTK_TBARGTK_H_
 #define _WX_GTK_TBARGTK_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "tbargtk.h"
 #endif
 
     #pragma interface "tbargtk.h"
 #endif
 


@@ -56,14 +56,14 @@ public:
 
     virtual void SetWindowStyleFlag( long style );
 
 
     virtual void SetWindowStyleFlag( long style );
 

+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    

     // implementation from now on
     // --------------------------
 
     GtkToolbar   *m_toolbar;
 
     // implementation from now on
     // --------------------------
 
     GtkToolbar   *m_toolbar;
 

-    GdkColor     *m_fg;
-    GdkColor     *m_bg;
-

     bool          m_blockEvent;
 
     void OnInternalIdle();
     bool          m_blockEvent;
 
     void OnInternalIdle();