Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mini-patch for better layout under OSX

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-01-28 08:23:43 +00:00
parent 2e97b58c63
commit 0150a5b8b9
2 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mac/button.cpp
View File

@@ -25,6 +25,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
// Button // Button
static const int kMacOSXHorizontalBorder = 1 ;
static const int kMacOSXVerticalBorder = 1 ;
bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos, const wxPoint& pos,
@@ -35,6 +37,12 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
Rect bounds ; Rect bounds ;
Str255 title ; Str255 title ;
if ( UMAHasAquaLayout() )
{
m_macHorizontalBorder = kMacOSXHorizontalBorder;
m_macVerticalBorder = kMacOSXVerticalBorder;
}
MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ; MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ;
m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1,
@@ -76,19 +84,23 @@ wxSize wxButton::DoGetBestSize() const
{ {
wxSize sz = GetDefaultSize() ; wxSize sz = GetDefaultSize() ;
int wBtn = m_label.Length() * 8 + 12 ; int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
int hBtn = 20 ;
if (wBtn > sz.x) sz.x = wBtn; if (wBtn > sz.x) sz.x = wBtn;
if (hBtn > sz.y) sz.y = hBtn;
return sz ; return sz ;
} }
wxSize wxButton::GetDefaultSize() wxSize wxButton::GetDefaultSize()
{ {
int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; int wBtn = 70 ;
int hBtn = 20 /* + 2 * m_macVerticalBorder */ ; int hBtn = 20 ;
if ( UMAHasAquaLayout() )
{
wBtn += 2 * kMacOSXHorizontalBorder ;
hBtn += 2 * kMacOSXVerticalBorder ;
}
return wxSize(wBtn, hBtn); return wxSize(wBtn, hBtn);
} }

22
src/mac/carbon/button.cpp
View File

@@ -25,6 +25,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
// Button // Button
static const int kMacOSXHorizontalBorder = 1 ;
static const int kMacOSXVerticalBorder = 1 ;
bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos, const wxPoint& pos,
@@ -35,6 +37,12 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
Rect bounds ; Rect bounds ;
Str255 title ; Str255 title ;
if ( UMAHasAquaLayout() )
{
m_macHorizontalBorder = kMacOSXHorizontalBorder;
m_macVerticalBorder = kMacOSXVerticalBorder;
}
MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ; MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ;
m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1,
@@ -76,19 +84,23 @@ wxSize wxButton::DoGetBestSize() const
{ {
wxSize sz = GetDefaultSize() ; wxSize sz = GetDefaultSize() ;
int wBtn = m_label.Length() * 8 + 12 ; int wBtn = m_label.Length() * 8 + 12 + 2 * kMacOSXHorizontalBorder ;
int hBtn = 20 ;
if (wBtn > sz.x) sz.x = wBtn; if (wBtn > sz.x) sz.x = wBtn;
if (hBtn > sz.y) sz.y = hBtn;
return sz ; return sz ;
} }
wxSize wxButton::GetDefaultSize() wxSize wxButton::GetDefaultSize()
{ {
int wBtn = 70 /* + 2 * m_macHorizontalBorder */ ; int wBtn = 70 ;
int hBtn = 20 /* + 2 * m_macVerticalBorder */ ; int hBtn = 20 ;
if ( UMAHasAquaLayout() )
{
wBtn += 2 * kMacOSXHorizontalBorder ;
hBtn += 2 * kMacOSXVerticalBorder ;
}
return wxSize(wBtn, hBtn); return wxSize(wBtn, hBtn);
} }