Applied Blit system options optimization to StretchBlit

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

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 2f3fc4939505a5dc584b83a9e60af165ef8abf88..344f8b7ef4520fc623a0a6ea2e4b8dbef6ceec5e 100644 (file)
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -324,7 +324,7 @@ private:
 
 - (id)initWithItemIdentifier: (NSString*) identifier
 {
 
 - (id)initWithItemIdentifier: (NSString*) identifier
 {

-    [super initWithItemIdentifier:identifier];
+    self = [super initWithItemIdentifier:identifier];

     impl = NULL;
     [self setTarget: self];
     [self setAction: @selector(clickedAction:)];
     impl = NULL;
     [self setTarget: self];
     [self setAction: @selector(clickedAction:)];


@@ -413,7 +413,7 @@ private:
 
 - (id)initWithFrame:(NSRect)frame
 {
 
 - (id)initWithFrame:(NSRect)frame
 {

-    [super initWithFrame:frame];
+    self = [super initWithFrame:frame];

     impl = NULL;
     [self setTarget: self];
     [self setAction: @selector(clickedAction:)];
     impl = NULL;
     [self setTarget: self];
     [self setAction: @selector(clickedAction:)];


@@ -1375,14 +1375,6 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
                 [v setButtonType: ( tool->CanBeToggled() ? NSToggleButton : NSMomentaryPushInButton )];
                 [v setImplementation:tool];
                 
                 [v setButtonType: ( tool->CanBeToggled() ? NSToggleButton : NSMomentaryPushInButton )];
                 [v setImplementation:tool];
                 

-                if ( style & wxTB_NOICONS )
-                    [v setImagePosition:NSNoImage];
-                else if ( style & wxTB_TEXT )
-                    [v setImagePosition:NSImageAbove];
-                else
-                    [v setImagePosition:NSImageOnly];
-
-

                 controlHandle = v;
 
 #if wxOSX_USE_NATIVE_TOOLBAR
                 controlHandle = v;
 
 #if wxOSX_USE_NATIVE_TOOLBAR


@@ -1399,6 +1391,13 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
                 tool->SetControlHandle( controlHandle );
                 tool->UpdateImages();
                 tool->UpdateLabel();
                 tool->SetControlHandle( controlHandle );
                 tool->UpdateImages();
                 tool->UpdateLabel();

+
+                if ( style & wxTB_NOICONS )
+                    [v setImagePosition:NSNoImage];
+                else if ( style & wxTB_TEXT )
+                    [v setImagePosition:NSImageAbove];
+                else
+                    [v setImagePosition:NSImageOnly];

                 [v sizeToFit];
                 
 #if 0
                 [v sizeToFit];
                 
 #if 0