// 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;
-
+
+ SetMinSize( size );
+
m_sizer = new wxBoxSizer(wxHORIZONTAL);
if (HasFlag(wxPB_USE_TEXTCTRL))
// the text control's proportion values defaults to 2
m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
}
-
+
return true;
}
m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
SetSizer(m_sizer);
- SetMinSize( m_sizer->GetMinSize() );
+
+ SetInitialSize( GetMinSize() );
}
#if wxUSE_TOOLTIPS
event.Skip();
// don't leave the textctrl empty
- if (m_text->GetValue().empty())
+ if (m_text && m_text->GetValue().empty())
UpdateTextCtrlFromPicker();
}