X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c257d44dd201f502a0e9a4bcff95958c6cd28182..f1d7cbac4369e180a8d7c19f386b301196d09369:/src/mac/toolbar.cpp diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp index 8e1d455afd..af7b209f37 100644 --- a/src/mac/toolbar.cpp +++ b/src/mac/toolbar.cpp @@ -310,7 +310,7 @@ bool wxToolBar::Realize() if ( icon ) { - m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , + m_macToolHandle = UMANewControl( window , &toolrect , "\p" , false , 0 , behaviour + kControlContentPictHandle , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ; ControlButtonContentInfo info ; @@ -321,9 +321,10 @@ bool wxToolBar::Realize() } else { - m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , + m_macToolHandle = UMANewControl( window , &toolrect , "\p" , false , 0 , behaviour , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ; } + UMAShowControl( m_macToolHandle ) ; m_macToolHandles.Add( m_macToolHandle ) ; tool->m_index = m_macToolHandles.Count() -1 ; if ( !tool->IsEnabled() ) @@ -387,7 +388,7 @@ bool wxToolBar::Realize() void wxToolBar::SetToolBitmapSize(const wxSize& size) { - m_defaultWidth = size.x+2; m_defaultHeight = size.y+2; + m_defaultWidth = size.x+4; m_defaultHeight = size.y+4; } // The button size is bigger than the bitmap size