Applied [ 827600 ] wxCalendarCtrl missing public

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

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index 0fb15ad03167f2dc78912e4bdc4324e51bd47138..5c90c03e246c6af811697876638e8718edc8a7a8 100644 (file)
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -10,7 +10,7 @@
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -65,7 +65,12 @@ public:
     // --------------
 
     void ApplyWidgetStyle();
+    bool IsOwnGtkWindow( GdkWindow *window );
 
+    // Since this wxButton doesn't derive from wxButtonBase (why?) we need
+    // to override this here too...
+    virtual bool ShouldInheritColours() const { return false; }
+    
 protected:
     virtual wxSize DoGetBestSize() const;