Corrected wxToolBar::ToolSetBitmapSize()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 0fa951bdf2be487bb25c82ca1fa69134cf0a7278..3c9b8da316a292dc39c87500130dd22edba28f96 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -150,7 +150,8 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
        m_x = x ;
        m_y = y ;
   }
        m_x = x ;
        m_y = y ;
   }

-  return true ;
+  
+  return TRUE;

 }
 
 wxToolBar::~wxToolBar()
 }
 
 wxToolBar::~wxToolBar()


@@ -386,7 +387,7 @@ bool wxToolBar::Realize()
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 {
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 {

-    m_defaultWidth = size.x; m_defaultHeight = size.y;
+    m_defaultWidth = size.x+2; m_defaultHeight = size.y+2;

 }
 
 // The button size is bigger than the bitmap size
 }
 
 // The button size is bigger than the bitmap size

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index 0fa951bdf2be487bb25c82ca1fa69134cf0a7278..3c9b8da316a292dc39c87500130dd22edba28f96 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -150,7 +150,8 @@ bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
        m_x = x ;
        m_y = y ;
   }
        m_x = x ;
        m_y = y ;
   }

-  return true ;
+  
+  return TRUE;

 }
 
 wxToolBar::~wxToolBar()
 }
 
 wxToolBar::~wxToolBar()


@@ -386,7 +387,7 @@ bool wxToolBar::Realize()
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 {
 
 void wxToolBar::SetToolBitmapSize(const wxSize& size)
 {

-    m_defaultWidth = size.x; m_defaultHeight = size.y;
+    m_defaultWidth = size.x+2; m_defaultHeight = size.y+2;

 }
 
 // The button size is bigger than the bitmap size
 }
 
 // The button size is bigger than the bitmap size