reset the tooltip text before changing it, this apparently prevents a spurious redraw...

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

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 21adf5f74d8472ffa316dd44dafb250a593c8c08..4b4953f462a6551ce6b10fd0592f1bffc7821b34 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -185,7 +185,7 @@ void wxComboListBox::OnLeftUp(wxMouseEvent& event)
     wxCommandEvent evt(wxEVT_COMMAND_COMBOBOX_SELECTED,m_combo->GetId());
     evt.SetInt(wxListBox::GetSelection());
     evt.SetEventObject(m_combo);
-    m_combo->ProcessEvent(evt);
+    m_combo->ProcessWindowEvent(evt);
 
     event.Skip();
 }
@@ -205,7 +205,7 @@ wxSize wxComboListBox::GetAdjustedSize(int minWidth,
 
 void wxComboBox::Init()
 {
-    m_lbox = (wxListBox *)NULL;
+    m_lbox = NULL;
 }
 
 wxComboBox::wxComboBox(wxWindow *parent,
@@ -427,6 +427,11 @@ wxString wxComboBox::GetStringSelection() const
     return GetLBox()->GetStringSelection();
 }
 
+wxClientDataType wxComboBox::GetClientDataType() const
+{
+    return GetLBox()->GetClientDataType();
+}
+
 void wxComboBox::SetClientDataType(wxClientDataType clientDataItemsType)
 {
     GetLBox()->SetClientDataType(clientDataItemsType);