Return raw text, not markup, from wxWebViewWebKit::GetSelectedText().

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

diff --git a/src/osx/iphone/toolbar.mm b/src/osx/iphone/toolbar.mm
index c65ee34d6664cb2a45f1fcc2887990b665c24da9..dcfe1a9bdac150377c2ddf700daa986af49f998c 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
 /////////////////////////////////////////////////////////////////////////////
@@ -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,8 +247,9 @@ bool wxToolBar::Create(
     }
     m_macToolbar = toolbar;
 
-    m_peer = new wxWidgetIPhoneImpl( this, toolbar );    
+    SetPeer(new wxWidgetIPhoneImpl( this, toolbar ));    
     MacPostControlCreate(pos, size) ;
+    return true;
 }
 
 wxToolBar::~wxToolBar()