Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/osx/iphone/toolbar.mm b/src/osx/iphone/toolbar.mm
index 58422ca1a9e6f78a85482a2a958677d1cdee3a6a..659fb243f2c664344f8d4ef0485c0672e34bee91 100644 (file)
--- a/src/osx/iphone/toolbar.mm
+++ b/src/osx/iphone/toolbar.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/carbon/toolbar.cpp
+// Name:        src/osx/iphone/toolbar.mm

 // Purpose:     wxToolBar
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxToolBar
 // Author:      Stefan Csomor
 // Modified by:


@@ -126,7 +126,7 @@ wxToolBarToolBase(
         [bui initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
         bui.width = 25.0f;
     }
         [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:)];
     {
         [bui initWithImage:bmpNormal.GetUIImage() style:UIBarButtonItemStylePlain target:toolbar
                       action:@selector(clickedAction:)];


@@ -218,7 +218,7 @@ bool wxToolBar::Create(
                        long style,
                        const wxString& name )
 {
                        long style,
                        const wxString& name )
 {

-    m_macIsUserPane = false ;
+    DontCreatePeer();

 
     if ( !wxToolBarBase::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;
 
     if ( !wxToolBarBase::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;