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
This commit is contained in:
@@ -76,6 +76,8 @@ public:
|
|||||||
virtual wxString GetLabel() const;
|
virtual wxString GetLabel() const;
|
||||||
virtual void SetLabel(const wxString& label) ;
|
virtual void SetLabel(const wxString& label) ;
|
||||||
|
|
||||||
|
// protect native font of box
|
||||||
|
virtual bool SetFont( const wxFont &font );
|
||||||
// Other external functions
|
// Other external functions
|
||||||
void Command(wxCommandEvent& event);
|
void Command(wxCommandEvent& event);
|
||||||
void SetFocus();
|
void SetFocus();
|
||||||
|
@@ -46,6 +46,9 @@ class WXDLLIMPEXP_CORE wxStaticBox: public wxControl
|
|||||||
virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
|
virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
|
||||||
|
|
||||||
virtual bool AcceptsFocus() const { return false; }
|
virtual bool AcceptsFocus() const { return false; }
|
||||||
|
|
||||||
|
// protect native font of box
|
||||||
|
virtual bool SetFont( const wxFont &font );
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -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
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user