removed wxLANGUAGE_SERBIAN, we must explicitly use either or wxLANGUAGE_SERBIAN_CYRIL...

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

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 62a4429f5972f1525b5fa9849ee0b470b9c9d6cb..e550e651c77c069d5baa959bd01aaa2cc23c55ae 100644 (file)
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -39,13 +39,13 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxWindow)
+IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl)

 
 BEGIN_EVENT_TABLE(wxPickerBase, wxControl)
     EVT_SIZE(wxPickerBase::OnSize)
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxPickerBase)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxPickerBase, wxControl)
     EVT_SIZE(wxPickerBase::OnSize)
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxPickerBase)
 END_EVENT_TABLE()

-WX_DELEGATE_TO_CONTROL_CONTAINER(wxPickerBase)
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPickerBase, wxControl)

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -104,6 +104,7 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
                 wxWindowDestroyEventHandler(wxPickerBase::OnTextCtrlDelete),
                 NULL, this);
 
                 wxWindowDestroyEventHandler(wxPickerBase::OnTextCtrlDelete),
                 NULL, this);
 

+        // the text control's proportion values defaults to 2

         m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
     }
 
         m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
     }
 


@@ -112,8 +113,9 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
 
 void wxPickerBase::PostCreation()
 {
 
 void wxPickerBase::PostCreation()
 {

-    // the picker's proportion value is fixed
-    m_sizer->Add(m_picker, 1, GetDefaultPickerCtrlFlag(), 5);
+    // the picker's proportion value defaults to 1 when there's no text control
+    // associated with it - in that case it defaults to 0
+    m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);

 
     SetSizer(m_sizer);
     m_sizer->SetSizeHints(this);
 
     SetSizer(m_sizer);
     m_sizer->SetSizeHints(this);