/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
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.IsOk() )
{
[bui initWithImage:bmpNormal.GetUIImage() style:UIBarButtonItemStylePlain target:toolbar
action:@selector(clickedAction:)];
long style,
const wxString& name )
{
- m_macIsUserPane = false ;
+ DontCreatePeer();
if ( !wxToolBarBase::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
return false;
switch ( [[UIApplication sharedApplication] statusBarStyle] )
{
+#ifdef __IPHONE_3_0
case UIStatusBarStyleBlackOpaque:
toolbar.barStyle = UIBarStyleBlack;
break;
toolbar.barStyle = UIBarStyleBlack;
toolbar.translucent = YES;
break;
+#endif
default:
toolbar.barStyle = UIBarStyleDefault;
break;
}
m_macToolbar = toolbar;
- m_peer = new wxWidgetIPhoneImpl( this, toolbar );
+ SetPeer(new wxWidgetIPhoneImpl( this, toolbar ));
MacPostControlCreate(pos, size) ;
}
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;