some != NULL checks

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

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index cb447864436f46509010b71e92df25801593cfa2..4635492a176663fd2be95b2858ffbd6ad4987a4a 100644 (file)
--- a/src/mac/button.cpp
+++ b/src/mac/button.cpp
@@ -15,9 +15,7 @@
 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)

-#endif

 
 #include <wx/mac/uma.h>
 // Button
 
 #include <wx/mac/uma.h>
 // Button


@@ -47,14 +45,39 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
 void wxButton::SetDefault()
 {
 
 void wxButton::SetDefault()
 {

-  wxWindow *parent = (wxWindow *)GetParent();
-  if (parent)
-      parent->SetDefaultItem(this);
-
+    wxWindow *parent = GetParent();
+    wxButton *btnOldDefault = NULL;
+    wxPanel *panel = wxDynamicCast(parent, wxPanel);
+    if ( panel )
+    {
+        btnOldDefault = panel->GetDefaultItem();
+        panel->SetDefaultItem(this);
+    }
+  
+  if ( btnOldDefault && btnOldDefault->m_macControl )
+  {
+               UMASetControlData( btnOldDefault->m_macControl , kControlButtonPart , kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)0) ) ;
+  }

   if ( m_macControl )
   {
                UMASetControlData( m_macControl , kControlButtonPart , kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)1) ) ;
   if ( m_macControl )
   {
                UMASetControlData( m_macControl , kControlButtonPart , kControlPushButtonDefaultTag , sizeof( Boolean ) , (char*)((Boolean)1) ) ;

-       }
+  }
+}
+
+wxSize wxButton::DoGetBestSize() const
+{
+    int wBtn = m_label.Length() * 8 + 12 + 2 * m_macHorizontalBorder;
+       int hBtn = 13 + 2 * m_macVerticalBorder;
+
+    return wxSize(wBtn, hBtn);
+}
+
+wxSize wxButton::GetDefaultSize()
+{
+    int wBtn = 15 * 8 + 12 + 2 * 2;
+       int hBtn = 13 + 2 * 2;
+
+    return wxSize(wBtn, hBtn);

 }
 
 void wxButton::Command (wxCommandEvent & event)
 }
 
 void wxButton::Command (wxCommandEvent & event)