X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/455f62c3b59063bee4a755a8e631c74dd5da813e..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/osx/iphone/toolbar.mm diff --git a/src/osx/iphone/toolbar.mm b/src/osx/iphone/toolbar.mm index c65ee34d66..659fb243f2 100644 --- a/src/osx/iphone/toolbar.mm +++ b/src/osx/iphone/toolbar.mm @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/osx/carbon/toolbar.cpp +// Name: src/osx/iphone/toolbar.mm // Purpose: wxToolBar // Author: Stefan Csomor // Modified by: // Created: 04/01/98 -// RCS-ID: $Id: toolbar.cpp 54954 2008-08-03 11:27:03Z VZ $ +// RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -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; @@ -247,7 +247,7 @@ bool wxToolBar::Create( } m_macToolbar = toolbar; - m_peer = new wxWidgetIPhoneImpl( this, toolbar ); + SetPeer(new wxWidgetIPhoneImpl( this, toolbar )); MacPostControlCreate(pos, size) ; }