X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b0ba7ee71e650e317476f4835eeb7a28832a8c7..1ec3a9848a6843aca1b3590f636a149dd274efdc:/src/univ/combobox.cpp?ds=sidebyside

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index b25e4bcb64..2e0af935fa 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
 // ============================================================================
@@ -76,25 +66,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 +126,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 +138,9 @@ protected:
                        const wxString& strArg);
 
 private:
+    // has the mouse been released on this control?
+    bool m_clicked;
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -173,6 +179,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 +193,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
@@ -241,7 +248,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
@@ -300,11 +308,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();
+    wxSize sizeBtn = m_btn->GetBestSize();
 
     wxCoord wText = width - sizeBtn.x;
-    m_text->SetSize(x, y, wText, height);
-    m_btn->SetSize(x + wText, y, sizeBtn.x, 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);
 }
 
 // ----------------------------------------------------------------------------
@@ -329,7 +338,7 @@ bool wxComboControl::Show(bool show)
 
     if (m_btn)
         m_btn->Show(show);
-    
+
     if (m_text)
         m_text->Show(show);
 
@@ -370,6 +379,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());
@@ -509,22 +519,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,
@@ -543,6 +559,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
@@ -764,7 +788,7 @@ wxClientData* wxComboBox::DoGetItemClientObject(int n) const
 // input handling
 // ----------------------------------------------------------------------------
 
-void wxComboControl::OnKey(wxCommandEvent& event)
+void wxComboControl::OnKey(wxKeyEvent& event)
 {
     if ( m_isPopupShown )
     {
@@ -819,7 +843,7 @@ wxStdComboBoxInputHandler::wxStdComboBoxInputHandler(wxInputHandler *inphand)
 {
 }
 
-bool wxStdComboBoxInputHandler::HandleKey(wxControl *control,
+bool wxStdComboBoxInputHandler::HandleKey(wxInputConsumer *consumer,
                                           const wxKeyEvent& event,
                                           bool pressed)
 {
@@ -839,13 +863,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