cleanup for 10.5

[wxWidgets.git] / src / common / fontpickercmn.cpp

diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp
index 6b2b4daba0b6869166562b84e758e86494f52ce0..92cf9898b69dbeeda5d1d0a16be99932afd88596 100644 (file)
--- a/src/common/fontpickercmn.cpp
+++ b/src/common/fontpickercmn.cpp
@@ -24,17 +24,21 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_FONTPICKERCTRL
+
 #include "wx/fontpicker.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
+
 #include "wx/fontenum.h"
 #include "wx/tokenzr.h"
 
-
 // ============================================================================
 // implementation
 // ============================================================================
 
-#if wxUSE_FONTPICKERCTRL
-
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_FONTPICKER_CHANGED)
 IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxFontPickerEvent, wxCommandEvent)
@@ -51,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;
@@ -62,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);
@@ -94,9 +98,9 @@ wxFont wxFontPickerCtrl::String2Font(const wxString &s)
     if (size.ToDouble(&n))
     {
         if (n < 1)
-            str = str.Left(str.Len() - size.Len()) + wxT("1");
+            str = str.Left(str.length() - size.length()) + wxT("1");
         else if (n >= m_nMaxPointSize)
-            str = str.Left(str.Len() - size.Len()) +
+            str = str.Left(str.length() - size.length()) +
                   wxString::Format(wxT("%d"), m_nMaxPointSize);
     }