From 0150a5b8b9fec7f1db67b732be4b041844fd61b3 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 28 Jan 2003 08:23:43 +0000 Subject: [PATCH] mini-patch for better layout under OSX git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/button.cpp | 24 ++++++++++++++++++------ src/mac/carbon/button.cpp | 24 ++++++++++++++++++------ 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/mac/button.cpp b/src/mac/button.cpp index b036d87636..d85d8bf7be 100644 --- a/src/mac/button.cpp +++ b/src/mac/button.cpp @@ -25,6 +25,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) #include "wx/mac/uma.h" // Button +static const int kMacOSXHorizontalBorder = 1 ; +static const int kMacOSXVerticalBorder = 1 ; bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, @@ -34,6 +36,12 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, { Rect bounds ; Str255 title ; + + if ( UMAHasAquaLayout() ) + { + m_macHorizontalBorder = kMacOSXHorizontalBorder; + m_macVerticalBorder = kMacOSXVerticalBorder; + } MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ; @@ -42,7 +50,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ; MacPostControlCreate() ; - + return TRUE; } @@ -76,19 +84,23 @@ wxSize wxButton::DoGetBestSize() const { wxSize sz = GetDefaultSize() ; - int wBtn = m_label.Length() * 8 + 12 ; - int hBtn = 20 ; + int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ; if (wBtn > sz.x) sz.x = wBtn; - if (hBtn > sz.y) sz.y = hBtn; return sz ; } wxSize wxButton::GetDefaultSize() { - int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; - int hBtn = 20 /* + 2 * m_macVerticalBorder */ ; + int wBtn = 70 ; + int hBtn = 20 ; + + if ( UMAHasAquaLayout() ) + { + wBtn += 2 * kMacOSXHorizontalBorder ; + hBtn += 2 * kMacOSXVerticalBorder ; + } return wxSize(wBtn, hBtn); } diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index b036d87636..d85d8bf7be 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -25,6 +25,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) #include "wx/mac/uma.h" // Button +static const int kMacOSXHorizontalBorder = 1 ; +static const int kMacOSXVerticalBorder = 1 ; bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, @@ -34,6 +36,12 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, { Rect bounds ; Str255 title ; + + if ( UMAHasAquaLayout() ) + { + m_macHorizontalBorder = kMacOSXHorizontalBorder; + m_macVerticalBorder = kMacOSXVerticalBorder; + } MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ; @@ -42,7 +50,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ; MacPostControlCreate() ; - + return TRUE; } @@ -76,19 +84,23 @@ wxSize wxButton::DoGetBestSize() const { wxSize sz = GetDefaultSize() ; - int wBtn = m_label.Length() * 8 + 12 ; - int hBtn = 20 ; + int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ; if (wBtn > sz.x) sz.x = wBtn; - if (hBtn > sz.y) sz.y = hBtn; return sz ; } wxSize wxButton::GetDefaultSize() { - int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; - int hBtn = 20 /* + 2 * m_macVerticalBorder */ ; + int wBtn = 70 ; + int hBtn = 20 ; + + if ( UMAHasAquaLayout() ) + { + wBtn += 2 * kMacOSXHorizontalBorder ; + hBtn += 2 * kMacOSXVerticalBorder ; + } return wxSize(wBtn, hBtn); } -- 2.50.0