Add wxBitmap(NSImage*) ctor to wxOSX.

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

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index af657ef34ddf14c5d9fa0f80331754aa1986130f..c2f01598e2d0df05a3673d25ec6751f6ec797148 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -23,26 +23,11 @@
     #pragma hdrstop
 #endif
 
+#include "wx/combo.h"
+
 #if wxUSE_COMBOBOX
 #include "wx/combobox.h"
 extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox";
-#endif
-
-#if wxUSE_COMBOCTRL
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/log.h"
-    #include "wx/dcclient.h"
-    #include "wx/settings.h"
-    #include "wx/timer.h"
-    #include "wx/textctrl.h"
-#endif
-
-#include "wx/tooltip.h"
-
-#include "wx/combo.h"
-
 
 // ----------------------------------------------------------------------------
 // XTI
@@ -110,6 +95,21 @@ wxEMPTY_HANDLERS_TABLE(wxComboBox)
 wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \
                 wxString, Value, wxPoint, Position, wxSize, Size )
 
+#endif // wxUSE_COMBOBOX
+
+#if wxUSE_COMBOCTRL
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/log.h"
+    #include "wx/dcclient.h"
+    #include "wx/settings.h"
+    #include "wx/timer.h"
+    #include "wx/textctrl.h"
+#endif
+
+#include "wx/tooltip.h"
+
 // constants
 // ----------------------------------------------------------------------------
 
@@ -2050,21 +2050,23 @@ void wxComboCtrlBase::OnCharEvent(wxKeyEvent& event)
 
 void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
 {
-// On Mac, this leads to infinite recursion and eventually a crash
-#ifdef __WXMAC__
-    wxUnusedVar(event);
-#else
+    // On Mac, setting focus here leads to infinite recursion and eventually
+    // a crash due to the SetFocus call producing another event.
+    // Handle Mac in OnIdleEvent using m_resetFocus.
+    
     if ( event.GetEventType() == wxEVT_SET_FOCUS )
     {
-        wxWindow* tc = GetTextCtrl();
-        if ( tc && tc != DoFindFocus() )
+        if ( GetTextCtrl() && !GetTextCtrl()->HasFocus() )
         {
-            tc->SetFocus();
+#ifdef __WXMAC__
+            m_resetFocus = true;
+#else
+            GetTextCtrl()->SetFocus();
+#endif
         }
     }
-
+    
     Refresh();
-#endif
 }
 
 void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) )
@@ -2072,9 +2074,8 @@ void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) )
     if ( m_resetFocus )
     {
         m_resetFocus = false;
-        wxWindow* tc = GetTextCtrl();
-        if ( tc )
-            tc->SetFocus();
+        if ( GetTextCtrl() )
+            GetTextCtrl()->SetFocus();
     }
 }