Minor header cleaning.

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

diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp
index 35bb1653f6b9715123b91675f0f920347bd0fb0d..00c68a699dfbf82ab2c7591070a3c222bfcaa12c 100644 (file)
--- a/src/common/fontpickercmn.cpp
+++ b/src/common/fontpickercmn.cpp
@@ -28,7 +28,10 @@
 
 #include "wx/fontpicker.h"
 
 
 #include "wx/fontpicker.h"
 

-#include "wx/textctrl.h"
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
+

 #include "wx/fontenum.h"
 #include "wx/tokenzr.h"
 
 #include "wx/fontenum.h"
 #include "wx/tokenzr.h"
 


@@ -36,6 +39,9 @@
 // implementation
 // ============================================================================
 
 // 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)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_FONTPICKER_CHANGED)
 IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxFontPickerEvent, wxCommandEvent)


@@ -52,9 +58,6 @@ bool wxFontPickerCtrl::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator,
                         const wxString &name )
 {
                         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;
     if (!wxPickerBase::CreateBase(parent, id, Font2String(initial),
                                   pos, size, style, validator, name))
         return false;


@@ -63,6 +66,9 @@ bool wxFontPickerCtrl::Create( wxWindow *parent, wxWindowID id,
     m_picker = new wxFontPickerWidget(this, wxID_ANY, initial,
                                       wxDefaultPosition, wxDefaultSize,
                                       GetPickerStyle(style));
     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);
     m_picker->Connect(wxEVT_COMMAND_FONTPICKER_CHANGED,
             wxFontPickerEventHandler(wxFontPickerCtrl::OnFontChange),
             NULL, this);