X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3870b2ff595ba4bb4f0397ace77ceeb9628e94d..95bcc40c745db8bcd392d06366436afb21964db6:/src/univ/combobox.cpp diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp index b90ef9ff70..74b01d4174 100644 --- a/src/univ/combobox.cpp +++ b/src/univ/combobox.cpp @@ -9,16 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -/* - TODO: - - +1. typing in the text should select the string in listbox - +2. scrollbars in listbox are unusable - +3. the initially selected item is not selected - ?4. kbd interface (what does GTK do?) - 5. there is still autoscrolling without scrollbars - but is it bad? - */ - // ============================================================================ // declarations // ============================================================================ @@ -51,6 +41,7 @@ #include "wx/validate.h" #endif +#include "wx/tooltip.h" #include "wx/popupwin.h" #include "wx/univ/renderer.h" @@ -65,6 +56,12 @@ 3. which passes them to the popup window if it is popped up */ +// constants +// ---------------------------------------------------------------------------- + +// the margin between the text control and the combo button +static const wxCoord g_comboMargin = 2; + // ---------------------------------------------------------------------------- // wxComboButton is just a normal button except that it sends commands to the // combobox and not its parent @@ -76,25 +73,35 @@ public: wxComboButton(wxComboControl *combo) : wxBitmapButton(combo->GetParent(), -1, wxNullBitmap, wxDefaultPosition, wxDefaultSize, - wxBORDER_NONE) + wxBORDER_NONE | wxBU_EXACTFIT) { m_combo = combo; - wxBitmap bmpNormal, bmpPressed, bmpDisabled; + wxBitmap bmpNormal, bmpFocus, bmpPressed, bmpDisabled; + + GetRenderer()->GetComboBitmaps(&bmpNormal, + &bmpFocus, + &bmpPressed, + &bmpDisabled); - GetRenderer()->GetComboBitmaps(&bmpNormal, &bmpPressed, &bmpDisabled); SetBitmapLabel(bmpNormal); - SetBitmapFocus(bmpNormal); - SetBitmapSelected(bmpPressed); - SetBitmapDisabled(bmpDisabled); + SetBitmapFocus(bmpFocus.Ok() ? bmpFocus : bmpNormal); + SetBitmapSelected(bmpPressed.Ok() ? bmpPressed : bmpNormal); + SetBitmapDisabled(bmpDisabled.Ok() ? bmpDisabled : bmpNormal); - SetSize(bmpNormal.GetWidth(), bmpNormal.GetHeight()); + SetBestSize(wxDefaultSize); } protected: void OnButton(wxCommandEvent& event) { m_combo->ShowPopup(); } - virtual wxSize DoGetBestSize() const { return GetSize(); } + virtual wxSize DoGetBestClientSize() const + { + const wxBitmap& bmp = GetBitmapLabel(); + + return wxSize(bmp.GetWidth(), bmp.GetHeight()); + + } private: wxComboControl *m_combo; @@ -126,6 +133,9 @@ protected: // filter mouse move events happening outside the list box void OnMouseMove(wxMouseEvent& event); + // set m_clicked value from here + void OnLeftUp(wxMouseEvent& event); + // called whenever the user selects or activates a listbox item void OnSelect(wxCommandEvent& event); @@ -135,6 +145,9 @@ protected: const wxString& strArg); private: + // has the mouse been released on this control? + bool m_clicked; + DECLARE_EVENT_TABLE() }; @@ -173,6 +186,7 @@ BEGIN_EVENT_TABLE(wxComboListBox, wxListBox) EVT_LISTBOX(-1, wxComboListBox::OnSelect) EVT_LISTBOX_DCLICK(-1, wxComboListBox::OnSelect) EVT_MOTION(wxComboListBox::OnMouseMove) + EVT_LEFT_UP(wxComboListBox::OnLeftUp) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxComboControl, wxControl) @@ -186,7 +200,7 @@ BEGIN_EVENT_TABLE(wxComboTextCtrl, wxTextCtrl) EVT_TEXT(-1, wxComboTextCtrl::OnText) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl); +IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) // ============================================================================ // implementation @@ -201,6 +215,8 @@ void wxComboControl::Init() m_popup = (wxComboPopup *)NULL; m_winPopup = (wxPopupComboWindow *)NULL; m_isPopupShown = FALSE; + m_btn = NULL; + m_text = NULL; } bool wxComboControl::Create(wxWindow *parent, @@ -239,7 +255,8 @@ bool wxComboControl::Create(wxWindow *parent, m_heightPopup = size.y - DoGetBestSize().y; } - DoSetSize(pos.x, pos.y, size.x, size.y); + SetBestSize(size); + Move(pos); // create the popup window immediately here to allow creating the controls // with parent == GetPopupWindow() from the derived class ctor @@ -284,7 +301,7 @@ wxSize wxComboControl::DoGetBestClientSize() const wxSize sizeBtn = m_btn->GetBestSize(), sizeText = m_text->GetBestSize(); - return wxSize(sizeBtn.x + sizeText.x, wxMax(sizeBtn.y, sizeText.y)); + return wxSize(sizeText.x + g_comboMargin + sizeBtn.x, wxMax(sizeBtn.y, sizeText.y)); } void wxComboControl::DoMoveWindow(int x, int y, int width, int height) @@ -298,12 +315,12 @@ void wxComboControl::DoMoveWindow(int x, int y, int width, int height) width -= rectBorders.x + rectBorders.width; height -= rectBorders.y + rectBorders.height; - wxSize sizeBtn = m_btn->GetSize(), - sizeText = m_text->GetSize(); + wxSize sizeBtn = m_btn->GetBestSize(); wxCoord wText = width - sizeBtn.x; - m_text->SetSize(x, y, wText, height); - m_btn->SetSize(x + wText, y, -1, height); + wxPoint p = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0); + m_text->SetSize(x - p.x, y - p.y, wText, height); + m_btn->SetSize(x - p.x + wText, y - p.y, sizeBtn.x, height); } // ---------------------------------------------------------------------------- @@ -326,12 +343,38 @@ bool wxComboControl::Show(bool show) if ( !wxControl::Show(show) ) return FALSE; - m_btn->Show(show); - m_text->Show(show); + if (m_btn) + m_btn->Show(show); + + if (m_text) + m_text->Show(show); return TRUE; } +#if wxUSE_TOOLTIPS +void wxComboControl::DoSetToolTip(wxToolTip *tooltip) +{ + wxControl::DoSetToolTip(tooltip); + + // Set tool tip for button and text box + if (m_text && m_btn) + { + if (tooltip) + { + const wxString &tip = tooltip->GetTip(); + m_text->SetToolTip(tip); + m_btn->SetToolTip(tip); + } + else + { + m_text->SetToolTip(NULL); + m_btn->SetToolTip(NULL); + } + } +} +#endif // wxUSE_TOOLTIPS + // ---------------------------------------------------------------------------- // popup window handling // ---------------------------------------------------------------------------- @@ -366,6 +409,7 @@ void wxComboControl::ShowPopup() m_winPopup->PositionNearCombo(); // show it + m_popup->OnShow(); m_winPopup->Popup(m_text); m_text->SelectAll(); m_popup->SetSelection(m_text->GetValue()); @@ -505,22 +549,28 @@ bool wxComboListBox::SetSelection(const wxString& value) void wxComboListBox::OnSelect(wxCommandEvent& event) { - // first let the user code have the event - - // all fields are already filled by the listbox, just change the event - // type and send it to the combo - wxCommandEvent event2 = event; - event2.SetEventType(wxEVT_COMMAND_COMBOBOX_SELECTED); - event2.SetEventObject(m_combo); - event2.SetId(m_combo->GetId()); - m_combo->ProcessEvent(event2); - - // next update the combo and close the listbox - m_combo->OnSelect(event.GetString()); + if ( m_clicked ) + { + // first update the combo and close the listbox + m_combo->OnSelect(event.GetString()); + + // next let the user code have the event + + // all fields are already filled by the listbox, just change the event + // type and send it to the combo + wxCommandEvent event2 = event; + event2.SetEventType(wxEVT_COMMAND_COMBOBOX_SELECTED); + event2.SetEventObject(m_combo); + event2.SetId(m_combo->GetId()); + m_combo->ProcessEvent(event2); + } + //else: ignore the events resultign from just moving the mouse initially } void wxComboListBox::OnShow() { + // nobody clicked us yet + m_clicked = FALSE; } bool wxComboListBox::PerformAction(const wxControlAction& action, @@ -539,6 +589,14 @@ bool wxComboListBox::PerformAction(const wxControlAction& action, return wxListBox::PerformAction(action, numArg, strArg); } +void wxComboListBox::OnLeftUp(wxMouseEvent& event) +{ + // we should dismiss the combo now + m_clicked = TRUE; + + event.Skip(); +} + void wxComboListBox::OnMouseMove(wxMouseEvent& event) { // while a wxComboListBox is shown, it always has capture, so if it doesn't @@ -690,10 +748,16 @@ void wxComboBox::SetEditable(bool editable) void wxComboBox::Clear() { GetLBox()->Clear(); + GetText()->SetValue(wxEmptyString); } void wxComboBox::Delete(int n) { + wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::Delete") ); + + if (GetSelection() == n) + GetText()->SetValue(wxEmptyString); + GetLBox()->Delete(n); } @@ -704,11 +768,15 @@ int wxComboBox::GetCount() const wxString wxComboBox::GetString(int n) const { + wxCHECK_MSG( (n >= 0) && (n < GetCount()), wxEmptyString, _T("invalid index in wxComboBox::GetString") ); + return GetLBox()->GetString(n); } void wxComboBox::SetString(int n, const wxString& s) { + wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::SetString") ); + GetLBox()->SetString(n, s); } @@ -719,7 +787,7 @@ int wxComboBox::FindString(const wxString& s) const void wxComboBox::Select(int n) { - wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid combobox index") ); + wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::Select") ); GetLBox()->SetSelection(n); GetText()->SetValue(GetLBox()->GetString(n)); @@ -727,8 +795,15 @@ void wxComboBox::Select(int n) int wxComboBox::GetSelection() const { +#if 1 // FIXME:: What is the correct behavior? // if the current value isn't one of the listbox strings, return -1 + return GetLBox()->GetSelection(); +#else + // Why oh why is this done this way? + // It is not because the value displayed in the text can be found + // in the list that it is the item that is selected! return FindString(GetText()->GetValue()); +#endif } int wxComboBox::DoAppend(const wxString& item) @@ -760,7 +835,7 @@ wxClientData* wxComboBox::DoGetItemClientObject(int n) const // input handling // ---------------------------------------------------------------------------- -void wxComboControl::OnKey(wxCommandEvent& event) +void wxComboControl::OnKey(wxKeyEvent& event) { if ( m_isPopupShown ) { @@ -815,7 +890,7 @@ wxStdComboBoxInputHandler::wxStdComboBoxInputHandler(wxInputHandler *inphand) { } -bool wxStdComboBoxInputHandler::HandleKey(wxControl *control, +bool wxStdComboBoxInputHandler::HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, bool pressed) { @@ -835,13 +910,13 @@ bool wxStdComboBoxInputHandler::HandleKey(wxControl *control, if ( !!action ) { - control->PerformAction(action); + consumer->PerformAction(action); return TRUE; } } - return wxStdInputHandler::HandleKey(control, event, pressed); + return wxStdInputHandler::HandleKey(consumer, event, pressed); } #endif // wxUSE_COMBOBOX