X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fec9cc08e7d94574af3f04b4c5fbafde63ac0b31..ce457f1245754243f17b4efde9ec773a8b3c3067:/src/common/fontpickercmn.cpp?ds=sidebyside diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp index 159b5403df..3ca7872f1d 100644 --- a/src/common/fontpickercmn.cpp +++ b/src/common/fontpickercmn.cpp @@ -39,6 +39,9 @@ // implementation // ============================================================================ +const wxChar wxFontPickerCtrlNameStr[] = wxT("fontpicker"); +const wxChar wxFontPickerWidgetNameStr[] = wxT("fontpickerwidget"); + DEFINE_EVENT_TYPE(wxEVT_COMMAND_FONTPICKER_CHANGED) IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase) IMPLEMENT_DYNAMIC_CLASS(wxFontPickerEvent, wxCommandEvent) @@ -55,10 +58,9 @@ 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), + if (!wxPickerBase::CreateBase(parent, id, + Font2String(initial.IsOk() ? initial + : *wxNORMAL_FONT), pos, size, style, validator, name)) return false; @@ -66,6 +68,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);