correct bug with using uninitialized end variable (unused variable warnings are not...

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

diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 05ff622e368ba1d1a4ee0617e3c3ddafe65cac66..ec7d0a2cee57bf46573b55ce520dbbb901f90bdb 100644 (file)
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -66,10 +66,13 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
     // remove any border style from our style as wxPickerBase's window must be
     // invisible (user styles must be set on the textctrl or the platform-dependent picker)
     style &= ~wxBORDER_MASK;
     // remove any border style from our style as wxPickerBase's window must be
     // invisible (user styles must be set on the textctrl or the platform-dependent picker)
     style &= ~wxBORDER_MASK;

+    

     if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
                            validator, name))
         return false;
     if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
                            validator, name))
         return false;

-
+        
+    SetMinSize( size );
+        

     m_sizer = new wxBoxSizer(wxHORIZONTAL);
 
     if (HasFlag(wxPB_USE_TEXTCTRL))
     m_sizer = new wxBoxSizer(wxHORIZONTAL);
 
     if (HasFlag(wxPB_USE_TEXTCTRL))


@@ -96,21 +99,21 @@ bool wxPickerBase::CreateBase(wxWindow *parent,
         // set the initial contents of the textctrl
         m_text->SetValue(text);
 
         // set the initial contents of the textctrl
         m_text->SetValue(text);
 

-        m_text->Connect(wxEVT_COMMAND_TEXT_UPDATED,
+        m_text->Connect(m_text->GetId(), wxEVT_COMMAND_TEXT_UPDATED,

                 wxCommandEventHandler(wxPickerBase::OnTextCtrlUpdate),
                 NULL, this);
                 wxCommandEventHandler(wxPickerBase::OnTextCtrlUpdate),
                 NULL, this);

-        m_text->Connect(wxEVT_KILL_FOCUS,
+        m_text->Connect(m_text->GetId(), wxEVT_KILL_FOCUS,

                 wxFocusEventHandler(wxPickerBase::OnTextCtrlKillFocus),
                 NULL, this);
 
                 wxFocusEventHandler(wxPickerBase::OnTextCtrlKillFocus),
                 NULL, this);
 

-        m_text->Connect(wxEVT_DESTROY,
+        m_text->Connect(m_text->GetId(), wxEVT_DESTROY,

                 wxWindowDestroyEventHandler(wxPickerBase::OnTextCtrlDelete),
                 NULL, this);
 
         // the text control's proportion values defaults to 2
         m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
     }
                 wxWindowDestroyEventHandler(wxPickerBase::OnTextCtrlDelete),
                 NULL, this);
 
         // the text control's proportion values defaults to 2
         m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
     }

-
+    

     return true;
 }
 
     return true;
 }
 


@@ -121,10 +124,13 @@ void wxPickerBase::PostCreation()
     m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
 
     SetSizer(m_sizer);
     m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
 
     SetSizer(m_sizer);

-    SetMinSize( m_sizer->GetMinSize() );
+    
+    SetInitialSize( GetMinSize() );

 }
 
 }
 

-void wxPickerBase::DoSetToolTip( wxToolTip *tip )
+#if wxUSE_TOOLTIPS
+
+void wxPickerBase::DoSetToolTip(wxToolTip *tip)

 {
     // don't set the tooltip on us but rather on our two child windows
     // as otherwise it would appear only when the cursor is placed on the
 {
     // don't set the tooltip on us but rather on our two child windows
     // as otherwise it would appear only when the cursor is placed on the


@@ -132,21 +138,22 @@ void wxPickerBase::DoSetToolTip( wxToolTip *tip )
     m_picker->SetToolTip(tip);
 
     // do a copy as wxWindow will own the pointer we pass
     m_picker->SetToolTip(tip);
 
     // do a copy as wxWindow will own the pointer we pass

-    m_text->SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);
+    if ( m_text )
+        m_text->SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);

 }
 
 }
 

-
+#endif // wxUSE_TOOLTIPS

 
 // ----------------------------------------------------------------------------
 // wxPickerBase - event handlers
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxPickerBase - event handlers
 // ----------------------------------------------------------------------------
 

-void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent &)
+void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent& event)

 {
 {

-    wxASSERT(m_text);
+    event.Skip();

 
     // don't leave the textctrl empty
 
     // don't leave the textctrl empty

-    if (m_text->GetValue().empty())
+    if (m_text && m_text->GetValue().empty())

         UpdateTextCtrlFromPicker();
 }
 
         UpdateTextCtrlFromPicker();
 }