From: David Surovell Date: Mon, 2 Jan 2006 02:29:16 +0000 (+0000) Subject: cleanup - reformat X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/25eb6881f75dbbe252f7d6f4bcd0c142306655ca cleanup - reformat git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index 9ece344ddf..ab9d4b1022 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -15,26 +15,29 @@ #include "wx/panel.h" #include "wx/stockitem.h" +#include "wx/mac/uma.h" + IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) -#include "wx/mac/uma.h" -// Button -bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) +bool wxButton::Create(wxWindow *parent, + wxWindowID id, + const wxString& lbl, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { wxString label(lbl); if (label.empty() && wxIsStockID(id)) label = wxGetStockLabel(id); - - m_macIsUserPane = FALSE ; - + + m_macIsUserPane = false ; + if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) ) return false; - + m_label = label ; Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; @@ -44,13 +47,13 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl, ControlButtonContentInfo info ; info.contentType = kControlContentIconRef ; GetIconRef(kOnSystemDisk, kSystemIconsCreator, kHelpIcon, &info.u.iconRef); - verify_noerr ( CreateRoundButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , kControlRoundButtonNormalSize , + verify_noerr ( CreateRoundButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , kControlRoundButtonNormalSize , &info , m_peer->GetControlRefAddr() ) ); } else if ( label.Find('\n' ) == wxNOT_FOUND && label.Find('\r' ) == wxNOT_FOUND) { #if TARGET_API_MAC_OSX - //Button height is static in Mac, can't be changed, so we need to force it here + // Button height is static in Mac, can't be changed, so we need to force it here if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE ) { bounds.bottom = bounds.top + 20 ; @@ -67,36 +70,38 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl, m_maxHeight = 15 ; } #endif + verify_noerr ( CreatePushButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") , m_peer->GetControlRefAddr() ) ); } else { ControlButtonContentInfo info ; info.contentType = kControlNoContent ; - verify_noerr(CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds,CFSTR(""), + verify_noerr(CreateBevelButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds, CFSTR(""), kControlBevelButtonLargeBevel , kControlBehaviorPushbutton , &info , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) ); } - - wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ; - - MacPostControlCreate(pos,size) ; - - return TRUE; + + wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid Mac control") ) ; + + MacPostControlCreate(pos, size) ; + + return true; } void wxButton::SetDefault() { wxWindow *parent = GetParent(); wxButton *btnOldDefault = NULL; + if ( parent ) { - btnOldDefault = wxDynamicCast(parent->GetDefaultItem(), - wxButton); + btnOldDefault = wxDynamicCast(parent->GetDefaultItem(), wxButton); parent->SetDefaultItem(this); } if ( btnOldDefault ) btnOldDefault->m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ; + m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 1 ) ; } @@ -104,26 +109,30 @@ wxSize wxButton::DoGetBestSize() const { if ( GetId() == wxID_HELP ) return wxSize( 20 , 20 ) ; - - wxSize sz = GetDefaultSize() ; + wxSize sz = GetDefaultSize() ; int charspace = 8 ; - if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL || GetWindowVariant() == wxWINDOW_VARIANT_LARGE ) - { - sz.y = 20 ; - charspace = 10 ; - } - else if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL ) - { - sz.y = 17 ; - charspace = 8 ; - } - else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI ) + + switch (GetWindowVariant()) { - sz.y = 15 ; - charspace = 8 ; + case wxWINDOW_VARIANT_NORMAL: + case wxWINDOW_VARIANT_LARGE: + sz.y = 20 ; + charspace = 10 ; + break; + + case wxWINDOW_VARIANT_SMALL: + sz.y = 17 ; + break; + + case wxWINDOW_VARIANT_MINI: + sz.y = 15 ; + break; + + default: + break; } - + Rect bestsize = { 0 , 0 , 0 , 0 } ; m_peer->GetBestRect( &bestsize ) ; @@ -137,8 +146,8 @@ wxSize wxButton::DoGetBestSize() const wBtn = bestsize.right - bestsize.left ; sz.y = bestsize.bottom - bestsize.top ; } - - if (wBtn > sz.x || ( GetWindowStyle() & wxBU_EXACTFIT) ) + + if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT)) sz.x = wBtn; return sz ; @@ -148,14 +157,14 @@ wxSize wxButton::GetDefaultSize() { int wBtn = 70 ; int hBtn = 20 ; - + return wxSize(wBtn, hBtn); } void wxButton::Command (wxCommandEvent & event) { m_peer->Flash(kControlButtonPart) ; - ProcessCommand (event); + ProcessCommand(event); } wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) @@ -163,6 +172,7 @@ wxInt32 wxButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId ); event.SetEventObject(this); ProcessCommand(event); - return noErr ; + + return noErr; } diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index 8f7163487b..ef90b54ce0 100644 --- a/src/mac/carbon/control.cpp +++ b/src/mac/carbon/control.cpp @@ -38,11 +38,13 @@ wxControl::wxControl() { } -bool wxControl::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) +bool wxControl::Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name) { bool rval = wxWindow::Create(parent, id, pos, size, style, name); @@ -55,18 +57,17 @@ bool wxControl::Create(wxWindow *parent, wxWindowID id, } #endif - if (rval) - { #if wxUSE_VALIDATORS + if (rval) SetValidator(validator); #endif - } + return rval; } wxControl::~wxControl() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; } bool wxControl::ProcessCommand (wxCommandEvent & event) @@ -81,14 +82,13 @@ void wxControl::OnKeyDown( wxKeyEvent &event ) { if ( m_peer == NULL || !m_peer->Ok() ) return ; - + char charCode ; - UInt32 keyCode ; - UInt32 modifiers ; + UInt32 keyCode, modifiers ; - GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode ); - GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); - GetEventParameter((EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers); + GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL,&charCode ); + GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); + GetEventParameter( (EventRef) wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers ); m_peer->HandleKey( keyCode , charCode , modifiers ) ; }