From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 23 Jan 2012 14:42:53 +0000 (+0000)
Subject: Fix wxButtonToolBar compilation after adding new wxFont ctor overload.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9aa727fa7d79b16588389a997602cc78a427a4b8

Fix wxButtonToolBar compilation after adding new wxFont ctor overload.

The new wxFont ctor added in r70445 resulted in ambiguity when using
wxFont(int, wxFontFamily, wxFontStyle, int) ctor mixing the type-safe values
for the 2nd and 3rd arguments with "untyped" int for the 4th one. Fix this by
avoiding the use of this ctor as it seems impossible to do it in any other
way.

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

diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp
index cf9e0ba75b..82d43dc554 100644
--- a/src/generic/buttonbar.cpp
+++ b/src/generic/buttonbar.cpp
@@ -140,7 +140,10 @@ bool wxButtonToolBar::Create(wxWindow *parent,
 
     // wxColour lightBackground(244, 244, 244);
 
-    wxFont font(wxSMALL_FONT->GetPointSize(), wxNORMAL_FONT->GetFamily(), wxNORMAL_FONT->GetStyle(), wxNORMAL);
+    wxFont font(wxSMALL_FONT->GetPointSize(),
+                wxNORMAL_FONT->GetFamily(),
+                wxNORMAL_FONT->GetStyle(),
+                wxFONTWEIGHT_NORMAL);
     SetFont(font);
 
     // Calculate the label height if necessary