X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9a4f2295344414e2ee4e3ec27fa5292918dff27..7c60222510bc5e197b12f153c4bf05db66cb0f4a:/src/osx/iphone/toolbar.mm diff --git a/src/osx/iphone/toolbar.mm b/src/osx/iphone/toolbar.mm index 58422ca1a9..dcfe1a9bda 100644 --- a/src/osx/iphone/toolbar.mm +++ b/src/osx/iphone/toolbar.mm @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/osx/carbon/toolbar.cpp +// Name: src/osx/iphone/toolbar.mm // Purpose: wxToolBar // Author: Stefan Csomor // Modified by: @@ -126,7 +126,7 @@ wxToolBarToolBase( [bui initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil]; bui.width = 25.0f; } - else if ( bmpNormal.Ok() ) + else if ( bmpNormal.IsOk() ) { [bui initWithImage:bmpNormal.GetUIImage() style:UIBarButtonItemStylePlain target:toolbar action:@selector(clickedAction:)]; @@ -218,7 +218,7 @@ bool wxToolBar::Create( long style, const wxString& name ) { - m_macIsUserPane = false ; + DontCreatePeer(); if ( !wxToolBarBase::Create( parent, id, pos, size, style, wxDefaultValidator, name ) ) return false; @@ -249,6 +249,7 @@ bool wxToolBar::Create( SetPeer(new wxWidgetIPhoneImpl( this, toolbar )); MacPostControlCreate(pos, size) ; + return true; } wxToolBar::~wxToolBar()