Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

setting the image position after the label is set, otherwise image_only will have the potential label over the image

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-09-03 16:19:28 +00:00
parent 857f05e1bf
commit 8f2139d0d8
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/osx/cocoa/toolbar.mm
View File

@@ -1375,14 +1375,6 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
[v setButtonType: ( tool->CanBeToggled() ? NSToggleButton : NSMomentaryPushInButton )]; [v setButtonType: ( tool->CanBeToggled() ? NSToggleButton : NSMomentaryPushInButton )];
[v setImplementation:tool]; [v setImplementation:tool];
if ( style & wxTB_NOICONS )
[v setImagePosition:NSNoImage];
else if ( style & wxTB_TEXT )
[v setImagePosition:NSImageAbove];
else
[v setImagePosition:NSImageOnly];
controlHandle = v; controlHandle = v;
#if wxOSX_USE_NATIVE_TOOLBAR #if wxOSX_USE_NATIVE_TOOLBAR
@@ -1399,6 +1391,13 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
tool->SetControlHandle( controlHandle ); tool->SetControlHandle( controlHandle );
tool->UpdateImages(); tool->UpdateImages();
tool->UpdateLabel(); tool->UpdateLabel();
if ( style & wxTB_NOICONS )
[v setImagePosition:NSNoImage];
else if ( style & wxTB_TEXT )
[v setImagePosition:NSImageAbove];
else
[v setImagePosition:NSImageOnly];
[v sizeToFit]; [v sizeToFit];
#if 0 #if 0