Use the current font for the DoGetBestSize calculation

[wxWidgets.git] / src / common / tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index f944cdd209f9d6659c79ae02b8d6908338b952c4..edfff6c1f204c334029c6bb870c466e01067983a 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -146,8 +146,10 @@ wxToolBarBase::wxToolBarBase()
 {
     // the list owns the pointers
     m_xMargin = m_yMargin = 0;
-
     m_maxRows = m_maxCols = 0;
+    m_toolPacking = m_toolSeparation = 0;
+    m_defaultWidth = 16;
+    m_defaultHeight = 15;
 }
 
 wxToolBarToolBase *wxToolBarBase::DoAddTool(int id,
@@ -738,8 +740,19 @@ bool wxCreateGreyedImage(const wxImage& in, wxImage& out)
 {
     out = in.Copy();
 
-    // assuming the pixels along the edges are of the background color
-    wxColour bgCol(in.GetRed(0, 0), in.GetGreen(0, 0), in.GetBlue(0, 0));
+    unsigned char r, g, b;
+    if ( in.HasMask() )
+    {
+        in.GetOrFindMaskColour(&r, &g, &b);
+    }
+    else // assuming the pixels along the edges are of the background color
+    {
+        r = in.GetRed(0, 0);
+        g = in.GetGreen(0, 0);
+        b = in.GetBlue(0, 0);
+    }
+
+    wxColour bgCol(r, g, b);
 
     wxColour darkCol = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW) ;
     wxColour lightCol = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT) ;