fix for the dialog controls font

[wxWidgets.git] / src / mac / toolbar.cpp

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index 8e1d455afd0d82940218da77543eed335df9ada5..984b5ab8d251f8adfecadc02ad62fea19927677a 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -29,7 +29,7 @@ BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
 END_EVENT_TABLE()
 #endif
 
 END_EVENT_TABLE()
 #endif
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -310,7 +310,7 @@ bool wxToolBar::Realize()
                                
                        if ( icon )
                        {
                                
                        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 ;
                                
                                        behaviour + kControlContentPictHandle , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
                                ControlButtonContentInfo info ;
                                


@@ -321,9 +321,10 @@ bool wxToolBar::Realize()
                        }
                        else
                        {
                        }
                        else
                        {

-                                               m_macToolHandle = UMANewControl( window , &toolrect , "\p" , true , 0 , 
+                                               m_macToolHandle = UMANewControl( window , &toolrect , "\p" , false , 0 , 

                                                behaviour  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
                        }
                                                behaviour  , 0 , kControlBevelButtonNormalBevelProc , (long) this ) ;
                        }

+                       UMAShowControl( m_macToolHandle ) ;

                        m_macToolHandles.Add( m_macToolHandle ) ;
                        tool->m_index = m_macToolHandles.Count() -1 ;
                        if ( !tool->IsEnabled() )
                        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)
 {
 
 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
 }
 
 // The button size is bigger than the bitmap size