Fix interface definition of GetMouseCursorAt

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

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 95df6afad42a1d6e3adfbea3269e4ca412501823..9d4118eaa261b72f63d94273c621c97984159c2f 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -180,7 +180,7 @@ void wxComboListBox::OnLeftUp(wxMouseEvent& event)
     m_combo->SetValue(wxListBox::GetStringSelection());
 
     // next let the user code have the event
     m_combo->SetValue(wxListBox::GetStringSelection());
 
     // next let the user code have the event

-    wxCommandEvent evt(wxEVT_COMMAND_COMBOBOX_SELECTED,m_combo->GetId());
+    wxCommandEvent evt(wxEVT_COMBOBOX,m_combo->GetId());

     evt.SetInt(wxListBox::GetSelection());
     evt.SetEventObject(m_combo);
     m_combo->ProcessWindowEvent(evt);
     evt.SetInt(wxListBox::GetSelection());
     evt.SetEventObject(m_combo);
     m_combo->ProcessWindowEvent(evt);


@@ -273,12 +273,15 @@ wxComboBox::~wxComboBox()
 
 wxString wxComboBox::DoGetValue() const
 {
 
 wxString wxComboBox::DoGetValue() const
 {

-    return wxComboCtrl::GetValue();
+    return GetTextCtrl() ? GetTextCtrl()->GetValue() : m_valueString;

 }
 
 void wxComboBox::SetValue(const wxString& value)
 {
 }
 
 void wxComboBox::SetValue(const wxString& value)
 {

-    wxComboCtrl::SetValue(value);
+    if ( GetTextCtrl() )
+        GetTextCtrl()->SetValue(value);
+    else
+        m_valueString = value;

 }
 
 void wxComboBox::WriteText(const wxString& value)
 }
 
 void wxComboBox::WriteText(const wxString& value)


@@ -357,7 +360,7 @@ void wxComboBox::SetEditable(bool editable)
 void wxComboBox::DoClear()
 {
     GetLBox()->Clear();
 void wxComboBox::DoClear()
 {
     GetLBox()->Clear();

-    if ( GetTextCtrl() ) GetTextCtrl()->SetValue(wxEmptyString);
+    SetValue(wxEmptyString);

 }
 
 void wxComboBox::DoDeleteOneItem(unsigned int n)
 }
 
 void wxComboBox::DoDeleteOneItem(unsigned int n)


@@ -365,7 +368,7 @@ void wxComboBox::DoDeleteOneItem(unsigned int n)
     wxCHECK_RET( IsValid(n), wxT("invalid index in wxComboBox::Delete") );
 
     if (GetSelection() == (int)n)
     wxCHECK_RET( IsValid(n), wxT("invalid index in wxComboBox::Delete") );
 
     if (GetSelection() == (int)n)

-        if ( GetTextCtrl() ) GetTextCtrl()->SetValue(wxEmptyString);
+        SetValue(wxEmptyString);

 
     GetLBox()->Delete(n);
 }
 
     GetLBox()->Delete(n);
 }