The Great wxRegion Refactoring:

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

diff --git a/src/mac/classic/button.cpp b/src/mac/classic/button.cpp
index 12864683c98d46497d957874a618204afebd191b..714983c2fa028b4a97c985493f8b7b7f94964418 100644 (file)
--- a/src/mac/classic/button.cpp
+++ b/src/mac/classic/button.cpp
@@ -16,7 +16,11 @@
 #endif
 
 #include "wx/button.h"
-#include "wx/panel.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/panel.h"
+#endif
+
 #include "wx/stockitem.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
@@ -62,13 +66,12 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
 
 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);
     }
 
     Boolean inData;
@@ -90,7 +93,7 @@ wxSize wxButton::DoGetBestSize() const
 {
     wxSize sz = GetDefaultSize() ;
 
-    int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
+    int wBtn = m_label.length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
 
     if (wBtn > sz.x) sz.x = wBtn;