From 98c9fc2d06dccf3c5792a99e55d1a7035a5cd67e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 20 Dec 2000 18:26:35 +0000 Subject: [PATCH] compilation fix (?) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/motif/font.h | 8 +------- src/motif/font.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h index d6aeb9e1bf..6fd46468d3 100644 --- a/include/wx/motif/font.h +++ b/include/wx/motif/font.h @@ -37,13 +37,7 @@ public: (void)Create(size, family, style, weight, underlined, face, encoding); } - wxFont(const wxNativeFontInfo& info) - { - Init(); - - (void)Create(info.pointSize, info.family, info.style, info.weight, - info.underlined, info.faceName, info.encoding); - } + wxFont(const wxNativeFontInfo& info); bool Create(int size, int family, diff --git a/src/motif/font.cpp b/src/motif/font.cpp index 9ce3b3cce0..d81184b0d1 100644 --- a/src/motif/font.cpp +++ b/src/motif/font.cpp @@ -35,9 +35,9 @@ #include "wx/font.h" #include "wx/gdicmn.h" #include "wx/utils.h" // for wxGetDisplay() -#include "wx/fontutil.h" +#include "wx/fontutil.h" // for wxNativeFontInfo - IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) +IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) // ---------------------------------------------------------------------------- // private classes @@ -186,6 +186,14 @@ wxFontRefData::~wxFontRefData() // wxFont // ---------------------------------------------------------------------------- +wxFont(const wxNativeFontInfo& info) +{ + Init(); + + (void)Create(info.pointSize, info.family, info.style, info.weight, + info.underlined, info.faceName, info.encoding); +} + void wxFont::Init() { if ( wxTheFontList )