refresh tree item after changing its icon so that the change is visible

[wxWidgets.git] / src / common / combocmn.cpp

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 4f327c2c5aa227f7171644ec9eb60739b2e62f51..e2a0fd70c37c05db04d7b3eb25af101bec82cebb 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -754,7 +754,7 @@ wxComboCtrlBase::CreateTextCtrl(int style, const wxValidator& validator)
         // navigation event is then sent to the wrong window.
         style |= wxTE_PROCESS_TAB;
 
-        if ( HasFlag(wxPROCESS_ENTER) )
+        if ( HasFlag(wxTE_PROCESS_ENTER) )
             style |= wxTE_PROCESS_ENTER;
 
         m_text = new wxTextCtrl(this, wxID_ANY, m_valueString,
@@ -1290,8 +1290,11 @@ wxBitmap& wxComboCtrlBase::GetBufferBitmap( const wxSize& sz ) const
 
 void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
 {
-    // Change event id and relay it forward
+    // Change event id, object and string before relaying it forward
     event.SetId(GetId());
+    wxString s = event.GetString();
+    event.SetEventObject(this);
+    event.SetString(s);
     event.Skip();
 }
 
@@ -1559,6 +1562,7 @@ void wxComboCtrlBase::DestroyPopup()
     if ( m_winPopup )
         m_winPopup->Destroy();
 
+    m_popupExtraHandler = (wxEvtHandler*) NULL;
     m_popupInterface = (wxComboPopup*) NULL;
     m_winPopup = (wxWindow*) NULL;
     m_popup = (wxWindow*) NULL;