X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c24dad6f7aa0797afa0a91861a0124a1099ea91..9a88fc583625296157989d8783a5a1d032082aec:/src/mac/carbon/combobxc.cpp?ds=sidebyside

diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp
index f5ba7c6f31..dc03529a98 100644
--- a/src/mac/carbon/combobxc.cpp
+++ b/src/mac/carbon/combobxc.cpp
@@ -12,8 +12,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/combobox.h"
-#include "wx/button.h"
-#include "wx/menu.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+    #include "wx/menu.h"
+#endif
+
 #include "wx/mac/uma.h"
 #if TARGET_API_MAC_OSX
 #ifndef __HIVIEW__
@@ -143,14 +147,10 @@ protected:
                 // This will invoke the dialog default action, such
                 // as the clicking the default button.
 
-                wxWindow *parent = GetParent();
-                while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
-                    parent = parent->GetParent();
-                }
-                if ( parent && parent->GetDefaultItem() )
+                wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+                if ( tlw && tlw->GetDefaultItem() )
                 {
-                    wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
-                                                          wxButton);
+                    wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
                     if ( def && def->IsEnabled() )
                     {
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );