Some cleanup.

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

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index 826a7756d86cb156261f399a7c394f9ed0d3ba8d..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


@@ -66,7 +64,7 @@ void wxButton::SetDefault()
   }
 }
 
   }
 }
 

-wxSize wxButton::DoGetBestSize()
+wxSize wxButton::DoGetBestSize() const

 {
     int wBtn = m_label.Length() * 8 + 12 + 2 * m_macHorizontalBorder;
        int hBtn = 13 + 2 * m_macVerticalBorder;
 {
     int wBtn = m_label.Length() * 8 + 12 + 2 * m_macHorizontalBorder;
        int hBtn = 13 + 2 * m_macVerticalBorder;


@@ -74,6 +72,14 @@ wxSize wxButton::DoGetBestSize()
     return wxSize(wBtn, hBtn);
 }
 
     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)
 {
     ProcessCommand (event);
 void wxButton::Command (wxCommandEvent & event)
 {
     ProcessCommand (event);