X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/116d7e58056decdd150cff720ae30abf734935d9..cc4d5638c66a409e421420ed7110917755a66788:/src/common/combocmn.cpp

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index c2f01598e2..d76166d771 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id$
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -72,8 +71,8 @@ wxEND_FLAGS( wxComboBoxStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl, "wx/combobox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxComboBox)
-wxEVENT_PROPERTY( Select, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent )
-wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
+wxEVENT_PROPERTY( Select, wxEVT_COMBOBOX, wxCommandEvent )
+wxEVENT_PROPERTY( TextEnter, wxEVT_TEXT_ENTER, wxCommandEvent )
 
 // TODO DELEGATES
 wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
@@ -389,7 +388,7 @@ void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
     wxWindow* popup = m_combo->GetPopupControl()->GetControl();
     wxWindow* winpopup = m_combo->GetPopupWindow();
 
-    if (
+    if ( !winFocused || (
          winFocused != m_focusStart &&
          winFocused != popup &&
          winFocused->GetParent() != popup &&
@@ -398,6 +397,7 @@ void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
          winFocused != m_combo &&
          winFocused != m_combo->GetButton() // GTK (atleast) requires this
         )
+       )
     {
         m_combo->HidePopup(true);
     }
@@ -1095,10 +1095,10 @@ wxComboCtrlBase::CreateTextCtrl(int style)
 
         // Connecting the events is currently the most reliable way
         wxWindowID id = m_text->GetId();
-        m_text->Connect(id, wxEVT_COMMAND_TEXT_UPDATED,
+        m_text->Connect(id, wxEVT_TEXT,
                         wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
                         NULL, this);
-        m_text->Connect(id, wxEVT_COMMAND_TEXT_ENTER,
+        m_text->Connect(id, wxEVT_TEXT_ENTER,
                         wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
                         NULL, this);
 
@@ -1787,7 +1787,7 @@ void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
         return;
     }
 
-    if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED )
+    if ( event.GetEventType() == wxEVT_TEXT )
     {
         if ( m_ignoreEvtText > 0 )
         {
@@ -2233,7 +2233,7 @@ void wxComboCtrlBase::OnButtonClick()
 
 void wxComboCtrlBase::Popup()
 {
-    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
+    wxCommandEvent event(wxEVT_COMBOBOX_DROPDOWN, GetId());
     event.SetEventObject(this);
     HandleWindowEvent(event);
 
@@ -2519,7 +2519,7 @@ void wxComboCtrlBase::OnPopupDismiss(bool generateEvent)
 
     if ( generateEvent )
     {
-        wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
+        wxCommandEvent event(wxEVT_COMBOBOX_CLOSEUP, GetId());
         event.SetEventObject(this);
         HandleWindowEvent(event);
     }