Disable some wxWebView tests that fail on the buildbot but not locally.

[wxWidgets.git] / src / osx / iphone / toolbar.mm

diff --git a/src/osx/iphone/toolbar.mm b/src/osx/iphone/toolbar.mm
index 7ec0bac59ccbf59278cca6f62386e26dab4e6ce7..659fb243f2c664344f8d4ef0485c0672e34bee91 100644 (file)
--- 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
 /////////////////////////////////////////////////////////////////////////////
@@ -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.IsOk() )
     {
         [bui initWithImage:bmpNormal.GetUIImage() style:UIBarButtonItemStylePlain target:toolbar
                       action:@selector(clickedAction:)];
@@ -213,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;
@@ -227,6 +232,7 @@ bool wxToolBar::Create(
     
     switch ( [[UIApplication sharedApplication] statusBarStyle] ) 
     {
+#ifdef __IPHONE_3_0
         case UIStatusBarStyleBlackOpaque:
             toolbar.barStyle = UIBarStyleBlack;
             break;
@@ -234,15 +240,15 @@ bool wxToolBar::Create(
             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) ;
-    NSLog(@"toolbar was created %@",toolbar);
 }
 
 wxToolBar::~wxToolBar()
@@ -259,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;