Fix GetNextItem for virtual wxListCtrl, and improve behavior for wxLIST_NEXT_ALL.

[wxWidgets.git] / src / mac / carbon / button.cpp

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index c5a3f521bdb67a90f8a1f707c512a0f05eb6a0e5..55785b73ace804bdf6ab677ee3e3215dc54599fc 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -15,6 +15,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/panel.h"
+    #include "wx/toplevel.h"
 #endif
 
 #include "wx/stockitem.h"
@@ -102,13 +103,12 @@ bool wxButton::Create(wxWindow *parent,
 
 void wxButton::SetDefault()
 {
-    wxWindow *parent = GetParent();
+    wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
     wxButton *btnOldDefault = NULL;
-
-    if ( parent )
+    if ( tlw )
     {
-        btnOldDefault = wxDynamicCast(parent->GetDefaultItem(), wxButton);
-        parent->SetDefaultItem(this);
+        btnOldDefault = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
+        tlw->SetDefaultItem(this);
     }
 
     if ( btnOldDefault )