X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3dcd96751b5a63610965c516200ea6e3d8c6e27..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/common/combocmn.cpp

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index b09c6965b7..7073151fa7 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1581,8 +1581,9 @@ void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
     if ( event.GetEventType() == wxEVT_SET_FOCUS )
     {
 #ifndef __WXMAC__
-        if ( m_text && m_text != ::wxWindow::FindFocus() )
-            m_text->SetFocus();
+        wxWindow* tc = GetTextCtrl();
+        if ( tc && tc != DoFindFocus() )
+            tc->SetFocus();
 #endif
     }
 
@@ -1777,6 +1778,8 @@ void wxComboCtrlBase::ShowPopup()
         popup = m_popup;
     }
 
+    winPopup->Enable();
+    
     wxASSERT( !m_popup || m_popup == popup ); // Consistency check.
 
     wxSize adjustedSize = m_popupInterface->GetAdjustedSize(widthPopup,
@@ -1923,20 +1926,13 @@ void wxComboCtrlBase::OnPopupDismiss()
     if ( IsPopupWindowState(Hidden) )
         return;
 
-    // NB: Focus setting is really funny, atleast on wxMSW. First of all,
-    //     we need to have SetFocus at the end. Otherwise wxTextCtrl may
-    //     freeze until focus goes somewhere else. Second, wxTreeCtrl as
-    //     popup, when dismissing, "steals" focus back to itself unless
-    //     SetFocus is called also here, exactly before m_popupWinState
-    //     is set to false. Which is truly weird since SetFocus is just
-    //     wxWindowMSW method and does not call event handler or anything like
-    //     that (ie. does not care about m_popupWinState).
-
-    SetFocus();
-
-    // This should preferably be set before focus.
+    // This must be set before focus - otherwise there will be recursive
+    // OnPopupDismisses.
     m_popupWinState = Hidden;
 
+    //SetFocus();
+    m_winPopup->Disable();
+
     // Inform popup control itself
     m_popupInterface->OnDismiss();