Fixed usage of wxXmString

[wxWidgets.git] / src / univ / combobox.cpp

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 50cb51feb2f88ce3175bec9d112550fbf7319a41..54ce379716f3f4638b5de833d2835b8ab2027c6e 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -314,8 +314,9 @@ void wxComboControl::DoMoveWindow(int x, int y, int width, int height)
     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);
 }
 
 // ----------------------------------------------------------------------------
@@ -520,7 +521,10 @@ bool wxComboListBox::SetSelection(const wxString& value)
 
 void wxComboListBox::OnSelect(wxCommandEvent& event)
 {
-    // first let the user code have the event
+    // 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
@@ -529,9 +533,6 @@ void wxComboListBox::OnSelect(wxCommandEvent& event)
     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());
 }
 
 void wxComboListBox::OnShow()
@@ -775,7 +776,7 @@ wxClientData* wxComboBox::DoGetItemClientObject(int n) const
 // input handling
 // ----------------------------------------------------------------------------
 
-void wxComboControl::OnKey(wxCommandEvent& event)
+void wxComboControl::OnKey(wxKeyEvent& event)
 {
     if ( m_isPopupShown )
     {