make sure group boxes don't get the big font

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/carbon/radiobox.h b/include/wx/osx/carbon/radiobox.h
index ac0747ff245bee54c5f404afcc39d3ac0126e846..6890aaafb75265450e130b2b0ad9b8ae6432233b 100644 (file)
--- a/include/wx/osx/carbon/radiobox.h
+++ b/include/wx/osx/carbon/radiobox.h
@@ -76,6 +76,8 @@ public:
     virtual wxString GetLabel() const;
     virtual void SetLabel(const wxString& label) ;
 
     virtual wxString GetLabel() const;
     virtual void SetLabel(const wxString& label) ;
 

+    // protect native font of box
+    virtual bool SetFont( const wxFont &font );

 // Other external functions
     void Command(wxCommandEvent& event);
     void SetFocus();
 // Other external functions
     void Command(wxCommandEvent& event);
     void SetFocus();

diff --git a/include/wx/osx/carbon/statbox.h b/include/wx/osx/carbon/statbox.h
index 7c1c2204cf2c0adcd3564bf03d8bf406f2c1c3b7..b7b86b08a99707630ccdc50547a28ce6ad6ad959 100644 (file)
--- a/include/wx/osx/carbon/statbox.h
+++ b/include/wx/osx/carbon/statbox.h
@@ -46,6 +46,9 @@ class WXDLLIMPEXP_CORE wxStaticBox: public wxControl
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
     
     virtual bool AcceptsFocus() const { return false; }
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
     
     virtual bool AcceptsFocus() const { return false; }

+
+    // protect native font of box
+    virtual bool SetFont( const wxFont &font );

 };
 
 #endif
 };
 
 #endif

diff --git a/src/osx/radiobox_osx.cpp b/src/osx/radiobox_osx.cpp
index dec4feb9a1f24f7b050ba2812be5ce462c372ef2..f6dc751f7585721203cb0da7d1aff2d048597d3e 100644 (file)
--- a/src/osx/radiobox_osx.cpp
+++ b/src/osx/radiobox_osx.cpp
@@ -516,4 +516,13 @@ wxSize wxRadioBox::DoGetBestSize() const
     return wxSize( totWidth, totHeight );
 }
 
     return wxSize( totWidth, totHeight );
 }
 

+bool wxRadioBox::SetFont(const wxFont& font)
+{
+    bool retval = wxWindowBase::SetFont( font );
+
+    // dont' update the native control, it has its own small font
+
+    return retval;
+}
+

 #endif // wxUSE_RADIOBOX
 #endif // wxUSE_RADIOBOX

diff --git a/src/osx/statbox_osx.cpp b/src/osx/statbox_osx.cpp
index 2b7b57ee0826a88af3ddd83f35b0d1a8782d2bfc..7f4d5a80107e1110553d0e5fc8821336f12f728d 100644 (file)
--- a/src/osx/statbox_osx.cpp
+++ b/src/osx/statbox_osx.cpp
@@ -65,5 +65,14 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
     *borderOther = other;
 }
 
     *borderOther = other;
 }
 

+bool wxStaticBox::SetFont(const wxFont& font)
+{
+    bool retval = wxWindowBase::SetFont( font );
+
+    // dont' update the native control, it has its own small font
+
+    return retval;
+}
+

 #endif // wxUSE_STATBOX
 
 #endif // wxUSE_STATBOX