wxMac should use /src/mac/carbon/spinctrl.cpp, applied some sizing

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

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index 5b895a059ef59d2615a83ab368e618507095127b..3a55ddec52e9ae6d5e996178d0f456b172529934 100644 (file)
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -10,7 +10,7 @@
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -67,6 +67,13 @@ 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; }
+    
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
 protected:
     virtual wxSize DoGetBestSize() const;