Controls will readjust their size and minsize when SetLabel or SetFont

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

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index 0454769f062bceb6750c0cee6a7a6f943ab769d2..f4d71460df7ae126d2d614ae116f73ebcb7e62fc 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -11,7 +11,7 @@
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 
 #ifndef __BMPBUTTONH__
 #define __BMPBUTTONH__
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -61,13 +61,14 @@ public:
     void NotFocus();
     void StartSelect();
     void EndSelect();
     void NotFocus();
     void StartSelect();
     void EndSelect();

-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);

 
     bool         m_hasFocus:1;
     bool         m_isSelected:1;
 
 protected:
     virtual void OnSetBitmap();
 
     bool         m_hasFocus:1;
     bool         m_isSelected:1;
 
 protected:
     virtual void OnSetBitmap();

+    virtual wxSize DoGetBestSize() const;

 
     void Init();
 
 
     void Init();