X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c2dc57d58994766ac9a6509043bb0ed578916cf..ae0e22dd7af3fa44819a08c21c9b478688e9d172:/src/osx/iphone/button.mm?ds=sidebyside diff --git a/src/osx/iphone/button.mm b/src/osx/iphone/button.mm index 71a362daf6..f897fdd5da 100644 --- a/src/osx/iphone/button.mm +++ b/src/osx/iphone/button.mm @@ -31,7 +31,7 @@ wxSize wxButton::DoGetBestSize() const wxSize sz = GetDefaultSize() ; wxRect r ; - + m_peer->GetBestRect(&r); if ( r.GetWidth() == 0 && r.GetHeight() == 0 ) @@ -41,7 +41,7 @@ wxSize wxButton::DoGetBestSize() const sz.y = r.GetHeight(); int wBtn = 72; - + if ((wBtn > sz.x) || ( GetWindowStyle() & wxBU_EXACTFIT)) sz.x = wBtn; @@ -61,7 +61,7 @@ wxSize wxButton::GetDefaultSize() + (void)initialize { static BOOL initialized = NO; - if (!initialized) + if (!initialized) { initialized = YES; wxOSXIPhoneClassAddWXMethods( self ); @@ -80,14 +80,14 @@ wxSize wxButton::GetDefaultSize() @end -wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, - wxWindowMac* WXUNUSED(parent), - wxWindowID id, +wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, + wxWindowMac* WXUNUSED(parent), + wxWindowID id, const wxString& WXUNUSED(label), - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long WXUNUSED(style), - long WXUNUSED(extraStyle)) + long WXUNUSED(style), + long WXUNUSED(extraStyle)) { CGRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; UIButtonType buttonType = UIButtonTypeRoundedRect; @@ -119,7 +119,7 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, { // Button height is static in Mac, can't be changed, so we need to force it here int maxHeight; - switch (wxpeer->GetWindowVariant() ) + switch (wxpeer->GetWindowVariant() ) { case wxWINDOW_VARIANT_NORMAL: case wxWINDOW_VARIANT_LARGE: @@ -153,21 +153,21 @@ wxWidgetImplType* wxWidgetImpl::CreateButton( wxWindowMac* wxpeer, } void wxWidgetIPhoneImpl::SetDefaultButton( bool isDefault ) -{ +{ } -void wxWidgetIPhoneImpl::PerformClick() +void wxWidgetIPhoneImpl::PerformClick() { } -wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer, - wxWindowMac* WXUNUSED(parent), - wxWindowID WXUNUSED(id), +wxWidgetImplType* wxWidgetImpl::CreateDisclosureTriangle( wxWindowMac* wxpeer, + wxWindowMac* WXUNUSED(parent), + wxWindowID WXUNUSED(id), const wxString& label, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long WXUNUSED(style), - long WXUNUSED(extraStyle)) + long WXUNUSED(style), + long WXUNUSED(extraStyle)) { CGRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ; wxUIButton* v = [[wxUIButton alloc] initWithFrame:r];