X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c257d44dd201f502a0e9a4bcff95958c6cd28182..2fe212b0336512aac9eace69fab09ce856b0bf4b:/src/mac/carbon/toolbar.cpp?ds=inline

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 8e1d455afd..984b5ab8d2 100644
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -29,7 +29,7 @@ BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
 END_EVENT_TABLE()
 #endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -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