use wxBoxSizer in wxPickerBase instead of doing the layout manually + other picker controls fixes (patch 1513042)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -55,9 +55,6 @@ bool wxFontPickerCtrl::Create( wxWindow *parent, wxWindowID id,
|
||||
long style, const wxValidator& validator,
|
||||
const wxString &name )
|
||||
{
|
||||
// by default, the textctrl is, if present, as big as the picker, for wxFontPickerCtrl
|
||||
SetTextCtrlProportion(1);
|
||||
|
||||
if (!wxPickerBase::CreateBase(parent, id, Font2String(initial),
|
||||
pos, size, style, validator, name))
|
||||
return false;
|
||||
@@ -66,6 +63,9 @@ bool wxFontPickerCtrl::Create( wxWindow *parent, wxWindowID id,
|
||||
m_picker = new wxFontPickerWidget(this, wxID_ANY, initial,
|
||||
wxDefaultPosition, wxDefaultSize,
|
||||
GetPickerStyle(style));
|
||||
// complete sizer creation
|
||||
wxPickerBase::PostCreation();
|
||||
|
||||
m_picker->Connect(wxEVT_COMMAND_FONTPICKER_CHANGED,
|
||||
wxFontPickerEventHandler(wxFontPickerCtrl::OnFontChange),
|
||||
NULL, this);
|
||||
|
||||
Reference in New Issue
Block a user