1. moved InheritAttributes() from wxControl to wxWindow

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

diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index f6d0a488574c68e874f08cf1537cb4ced81427dd..5c90c03e246c6af811697876638e8718edc8a7a8 100644 (file)
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -10,7 +10,7 @@
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -65,7 +65,12 @@ public:
     // --------------
 
     void ApplyWidgetStyle();
     // --------------
 
     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;
 
 protected:
     virtual wxSize DoGetBestSize() const;