using Large System font for Buttons needs more space

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

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 49c0586734ea223ef79add37d767e5caf26ab028..cc3685a17d5a5d3334f3df4604b7a6242d54ffbc 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -25,8 +25,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 #include "wx/mac/uma.h"
 // Button
 
 #include "wx/mac/uma.h"
 // Button
 

-static const int kMacOSXHorizontalBorder = 1 ;
-static const int kMacOSXVerticalBorder = 1 ;
+static const int kMacOSXHorizontalBorder = 2 ;
+static const int kMacOSXVerticalBorder = 4 ;

 
 bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos,
 
 bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos,


@@ -34,6 +34,9 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

+    if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )
+        return false;
+

     Rect bounds ;
     Str255 title ;
 
     Rect bounds ;
     Str255 title ;
 


@@ -84,7 +87,7 @@ wxSize wxButton::DoGetBestSize() const
 {
   wxSize sz = GetDefaultSize() ;
   
 {
   wxSize sz = GetDefaultSize() ;
   

-  int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
+  int wBtn = m_label.Length() * 10 + 12 + 2 * kMacOSXHorizontalBorder ;

     
   if (wBtn > sz.x) sz.x = wBtn;
   
     
   if (wBtn > sz.x) sz.x = wBtn;
   


@@ -117,7 +120,7 @@ void wxButton::Command (wxCommandEvent & event)
     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 

-void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 controlpart ) 
+void wxButton::MacHandleControlClick( WXWidget WXUNUSED(control) , wxInt16 controlpart , bool WXUNUSED(mouseStillDown) ) 

 {
     if ( controlpart != kControlNoPart )
     {
 {
     if ( controlpart != kControlNoPart )
     {