From eba3e39426a57ff65efc1edec48fbab815ba4fb1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 21 Jan 2014 19:32:04 +0000 Subject: [PATCH] Move deprecated wxFont ctor implementation out of line. Blind fix to avoid strange warnings given by OS X build slave about the ctor being deprecated when it's defined, not used. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/font.h | 5 +---- src/osx/carbon/font.cpp | 12 ++++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h index d54e79e17e..c82194d70f 100644 --- a/include/wx/osx/font.h +++ b/include/wx/osx/font.h @@ -127,10 +127,7 @@ public: int weight, bool underlined = false, const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); - } + wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // implementation only from now on diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index c3ad61eb15..7dd90920d1 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -557,6 +557,18 @@ wxFont::wxFont(const wxString& fontdesc) (void)Create(info); } +wxFont::wxFont(int size, + int family, + int style, + int weight, + bool underlined, + const wxString& face, + wxFontEncoding encoding) +{ + (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, + (wxFontWeight)weight, underlined, face, encoding); +} + bool wxFont::Create(int pointSize, wxFontFamily family, wxFontStyle style,