X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d4e5272b3a2abfb9d365df93c54c52de965ba7ef..232ba4c3329127a3ae57e37dc088513d06fe436f:/src/univ/combobox.cpp diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp index 74b01d4174..6e6db1fce3 100644 --- a/src/univ/combobox.cpp +++ b/src/univ/combobox.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "univcombobox.h" #endif @@ -71,7 +71,7 @@ class wxComboButton : public wxBitmapButton { public: wxComboButton(wxComboControl *combo) - : wxBitmapButton(combo->GetParent(), -1, wxNullBitmap, + : wxBitmapButton(combo->GetParent(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxBU_EXACTFIT) { @@ -93,7 +93,7 @@ public: } protected: - void OnButton(wxCommandEvent& event) { m_combo->ShowPopup(); } + void OnButton(wxCommandEvent& WXUNUSED(event)) { m_combo->ShowPopup(); } virtual wxSize DoGetBestClientSize() const { @@ -123,8 +123,11 @@ public: // implement wxComboPopup methods virtual bool SetSelection(const wxString& value); + virtual void SetSelection(int n, bool select) + { wxListBox::SetSelection( n, select); }; virtual wxControl *GetControl() { return this; } virtual void OnShow(); + virtual wxCoord GetBestWidth() const; protected: // we shouldn't return height too big from here @@ -179,12 +182,12 @@ private: // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(wxComboButton, wxButton) - EVT_BUTTON(-1, wxComboButton::OnButton) + EVT_BUTTON(wxID_ANY, wxComboButton::OnButton) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxComboListBox, wxListBox) - EVT_LISTBOX(-1, wxComboListBox::OnSelect) - EVT_LISTBOX_DCLICK(-1, wxComboListBox::OnSelect) + EVT_LISTBOX(wxID_ANY, wxComboListBox::OnSelect) + EVT_LISTBOX_DCLICK(wxID_ANY, wxComboListBox::OnSelect) EVT_MOTION(wxComboListBox::OnMouseMove) EVT_LEFT_UP(wxComboListBox::OnLeftUp) END_EVENT_TABLE() @@ -197,7 +200,7 @@ END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxComboTextCtrl, wxTextCtrl) EVT_KEY_DOWN(wxComboTextCtrl::OnKey) EVT_KEY_UP(wxComboTextCtrl::OnKey) - EVT_TEXT(-1, wxComboTextCtrl::OnText) + EVT_TEXT(wxID_ANY, wxComboTextCtrl::OnText) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) @@ -214,7 +217,7 @@ void wxComboControl::Init() { m_popup = (wxComboPopup *)NULL; m_winPopup = (wxPopupComboWindow *)NULL; - m_isPopupShown = FALSE; + m_isPopupShown = false; m_btn = NULL; m_text = NULL; } @@ -233,7 +236,7 @@ bool wxComboControl::Create(wxWindow *parent, style &= ~wxBORDER_NONE; style |= wxBORDER_SUNKEN; if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) - return FALSE; + return false; // create the text control and the button as our siblings (*not* children), // don't care about size/position here - they will be set in DoMoveWindow() @@ -245,10 +248,10 @@ bool wxComboControl::Create(wxWindow *parent, // for compatibility with the other ports, the height specified is the // combined height of the combobox itself and the popup - if ( size.y == -1 ) + if ( size.y == wxDefaultCoord ) { // ok, use default height for popup too - m_heightPopup = -1; + m_heightPopup = wxDefaultCoord; } else { @@ -264,20 +267,20 @@ bool wxComboControl::Create(wxWindow *parent, // have to disable this window to avoid interfering it with message // processing to the text and the button... but pretend it is enabled to - // make IsEnabled() return TRUE - wxControl::Enable(FALSE); // don't use non virtual Disable() here! - m_isEnabled = TRUE; + // make IsEnabled() return true + wxControl::Enable(false); // don't use non virtual Disable() here! + m_isEnabled = true; CreateInputHandler(wxINP_HANDLER_COMBOBOX); - return TRUE; + return true; } wxComboControl::~wxComboControl() { // as the button and the text control are the parent's children and not // ours, we have to delete them manually - they are not deleted - // automatically by wxWindows when we're deleted + // automatically by wxWidgets when we're deleted delete m_btn; delete m_text; @@ -289,7 +292,7 @@ wxComboControl::~wxComboControl() // ---------------------------------------------------------------------------- void wxComboControl::DoSetSize(int x, int y, - int width, int height, + int width, int WXUNUSED(height), int sizeFlags) { // combo height is always fixed @@ -300,8 +303,15 @@ wxSize wxComboControl::DoGetBestClientSize() const { wxSize sizeBtn = m_btn->GetBestSize(), sizeText = m_text->GetBestSize(); + wxCoord widthPopup = 0; - return wxSize(sizeText.x + g_comboMargin + sizeBtn.x, wxMax(sizeBtn.y, sizeText.y)); + if (m_popup) + { + widthPopup = m_popup->GetBestWidth(); + } + + return wxSize(wxMax(sizeText.x + g_comboMargin + sizeBtn.x, widthPopup), + wxMax(sizeBtn.y, sizeText.y)); } void wxComboControl::DoMoveWindow(int x, int y, int width, int height) @@ -330,18 +340,18 @@ void wxComboControl::DoMoveWindow(int x, int y, int width, int height) bool wxComboControl::Enable(bool enable) { if ( !wxControl::Enable(enable) ) - return FALSE; + return false; m_btn->Enable(enable); m_text->Enable(enable); - return TRUE; + return true; } bool wxComboControl::Show(bool show) { if ( !wxControl::Show(show) ) - return FALSE; + return false; if (m_btn) m_btn->Show(show); @@ -349,7 +359,7 @@ bool wxComboControl::Show(bool show) if (m_text) m_text->Show(show); - return TRUE; + return true; } #if wxUSE_TOOLTIPS @@ -393,7 +403,7 @@ void wxComboControl::ShowPopup() // size and position the popup window correctly m_winPopup->SetSize(GetSize().x, - m_heightPopup == -1 ? control->GetBestSize().y + m_heightPopup == wxDefaultCoord ? control->GetBestSize().y : m_heightPopup); wxSize sizePopup = m_winPopup->GetClientSize(); control->SetSize(0, 0, sizePopup.x, sizePopup.y); @@ -414,7 +424,7 @@ void wxComboControl::ShowPopup() m_text->SelectAll(); m_popup->SetSelection(m_text->GetValue()); - m_isPopupShown = TRUE; + m_isPopupShown = true; } void wxComboControl::HidePopup() @@ -424,7 +434,7 @@ void wxComboControl::HidePopup() m_winPopup->Dismiss(); - m_isPopupShown = FALSE; + m_isPopupShown = false; } void wxComboControl::OnSelect(const wxString& value) @@ -449,7 +459,7 @@ wxComboTextCtrl::wxComboTextCtrl(wxComboControl *combo, const wxString& value, long style, const wxValidator& validator) - : wxTextCtrl(combo->GetParent(), -1, value, + : wxTextCtrl(combo->GetParent(), wxID_ANY, value, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | style, validator) @@ -512,7 +522,7 @@ void wxComboTextCtrl::OnKey(wxKeyEvent& event) // ---------------------------------------------------------------------------- wxComboListBox::wxComboListBox(wxComboControl *combo, int style) - : wxListBox(combo->GetPopupWindow(), -1, + : wxListBox(combo->GetPopupWindow(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxBORDER_SIMPLE | wxLB_INT_HEIGHT | style), @@ -541,10 +551,10 @@ bool wxComboListBox::SetSelection(const wxString& value) else if ( !FindItem(value) ) { // no match att all - return FALSE; + return false; } - return TRUE; + return true; } void wxComboListBox::OnSelect(wxCommandEvent& event) @@ -570,7 +580,7 @@ void wxComboListBox::OnSelect(wxCommandEvent& event) void wxComboListBox::OnShow() { // nobody clicked us yet - m_clicked = FALSE; + m_clicked = false; } bool wxComboListBox::PerformAction(const wxControlAction& action, @@ -583,7 +593,7 @@ bool wxComboListBox::PerformAction(const wxControlAction& action, // we don't let the listbox handle this as instead of just using the // single key presses, as usual, we use the text ctrl value as prefix // and this is done by wxComboControl itself - return TRUE; + return true; } return wxListBox::PerformAction(action, numArg, strArg); @@ -592,7 +602,7 @@ bool wxComboListBox::PerformAction(const wxControlAction& action, void wxComboListBox::OnLeftUp(wxMouseEvent& event) { // we should dismiss the combo now - m_clicked = TRUE; + m_clicked = true; event.Skip(); } @@ -615,6 +625,12 @@ void wxComboListBox::OnMouseMove(wxMouseEvent& event) } } +wxCoord wxComboListBox::GetBestWidth() const +{ + wxSize size = wxListBox::GetBestSize(); + return size.x; +} + wxSize wxComboListBox::DoGetBestClientSize() const { // don't return size too big or we risk to not fit on the screen @@ -641,13 +657,44 @@ void wxComboBox::Init() m_lbox = (wxListBox *)NULL; } +wxComboBox::wxComboBox(wxWindow *parent, + wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name) +{ + Init(); + + Create(parent, id, value, pos, size, choices, style, validator, name); +} + +bool wxComboBox::Create(wxWindow *parent, + wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name) +{ + wxCArrayString chs(choices); + + return Create(parent, id, value, pos, size, chs.GetCount(), + chs.GetStrings(), style, validator, name); +} + bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, int n, - const wxString *choices, + const wxString choices[], long style, const wxValidator& validator, const wxString& name) @@ -655,7 +702,7 @@ bool wxComboBox::Create(wxWindow *parent, if ( !wxComboControl::Create(parent, id, value, pos, size, style, validator, name) ) { - return FALSE; + return false; } wxComboListBox *combolbox = @@ -665,7 +712,7 @@ bool wxComboBox::Create(wxWindow *parent, SetPopupControl(combolbox); - return TRUE; + return true; } wxComboBox::~wxComboBox() @@ -811,6 +858,18 @@ int wxComboBox::DoAppend(const wxString& item) return GetLBox()->Append(item); } +int wxComboBox::DoInsert(const wxString& item, int pos) +{ + wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list")); + wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index")); + + if (pos == GetCount()) + return DoAppend(item); + + GetLBox()->Insert(item, pos); + return pos; +} + void wxComboBox::DoSetItemClientData(int n, void* clientData) { GetLBox()->SetClientData(n, clientData); @@ -852,14 +911,14 @@ bool wxComboControl::PerformAction(const wxControlAction& action, long numArg, const wxString& strArg) { - bool processed = FALSE; + bool processed = false; if ( action == wxACTION_COMBOBOX_POPUP ) { if ( !m_isPopupShown ) { ShowPopup(); - processed = TRUE; + processed = true; } } else if ( action == wxACTION_COMBOBOX_DISMISS ) @@ -868,7 +927,7 @@ bool wxComboControl::PerformAction(const wxControlAction& action, { HidePopup(); - processed = TRUE; + processed = true; } } @@ -878,7 +937,7 @@ bool wxComboControl::PerformAction(const wxControlAction& action, return wxControl::PerformAction(action, numArg, strArg); } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -908,11 +967,11 @@ bool wxStdComboBoxInputHandler::HandleKey(wxInputConsumer *consumer, break; } - if ( !!action ) + if ( !action.IsEmpty() ) { consumer->PerformAction(action); - return TRUE; + return true; } }