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

merge with latest sources

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2000-08-09 10:10:14 +00:00
parent 57681e5bfd
commit 2f1ae41432
176 changed files with 7712 additions and 5094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mac/button.cpp
View File

@@ -15,7 +15,9 @@
#include "wx/button.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
#endif
#include <wx/mac/uma.h>
// Button
@@ -29,8 +31,6 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
{
Rect bounds ;
Str255 title ;
m_macHorizontalBorder = 2 ; // additional pixels around the real control
m_macVerticalBorder = 2 ;
MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ;
@@ -66,22 +66,32 @@ void wxButton::SetDefault()
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 ;
int hBtn = 20 ;
if ( wBtn < 80 )
wBtn = 80 ;
return wxSize(wBtn, hBtn);
}
wxSize wxButton::GetDefaultSize()
{
int wBtn = 15 * 8 + 12 + 2 * 2;
int hBtn = 13 + 2 * 2;
int wBtn = 80 /* + 2 * m_macHorizontalBorder */ ;
int hBtn = 20 /* + 2 * m_macVerticalBorder */ ;
return wxSize(wBtn, hBtn);
}
void wxButton::Command (wxCommandEvent & event)
{
if ( m_macControl )
{
HiliteControl( m_macControl , kControlButtonPart ) ;
unsigned long finalTicks ;
Delay( 8 , &finalTicks ) ;
HiliteControl( m_macControl , 0 ) ;
}
ProcessCommand (event);
}