X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6494f8d1425e0e582686bfd38334ef82d277cb44..1852bf0db53e22235738dfea8aebe929c6c1390c:/src/osx/iphone/toolbar.mm diff --git a/src/osx/iphone/toolbar.mm b/src/osx/iphone/toolbar.mm index 4892a57e82..c65ee34d66 100644 --- a/src/osx/iphone/toolbar.mm +++ b/src/osx/iphone/toolbar.mm @@ -121,7 +121,12 @@ wxToolBarToolBase( UIBarButtonItemStyle style = UIBarButtonItemStylePlain; wxUIToolbar* toolbar = (wxUIToolbar*) tbar->GetHandle(); - if ( bmpNormal.Ok() ) + if ( id == wxID_SEPARATOR ) + { + [bui initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil]; + bui.width = 25.0f; + } + else if ( bmpNormal.Ok() ) { [bui initWithImage:bmpNormal.GetUIImage() style:UIBarButtonItemStylePlain target:toolbar action:@selector(clickedAction:)]; @@ -260,6 +265,18 @@ bool wxToolBar::Realize() return true; } +void wxToolBar::DoLayout() +{ + // TODO port back osx_cocoa layout solution +} + +void wxToolBar::DoSetSize(int x, int y, int width, int height, int sizeFlags) +{ + wxToolBarBase::DoSetSize(x, y, width, height, sizeFlags); + + DoLayout(); +} + void wxToolBar::SetToolBitmapSize(const wxSize& size) { m_defaultWidth = size.x;