Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix (?)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-12-20 18:26:35 +00:00
parent 080b749f7d
commit 98c9fc2d06
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/motif/font.h
View File

@@ -37,13 +37,7 @@ public:
(void)Create(size, family, style, weight, underlined, face, encoding); (void)Create(size, family, style, weight, underlined, face, encoding);
} }
wxFont(const wxNativeFontInfo& info) wxFont(const wxNativeFontInfo& info);
{
Init();
(void)Create(info.pointSize, info.family, info.style, info.weight,
info.underlined, info.faceName, info.encoding);
}
bool Create(int size, bool Create(int size,
int family, int family,

12
src/motif/font.cpp
View File

@@ -35,9 +35,9 @@
#include "wx/font.h" #include "wx/font.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/utils.h" // for wxGetDisplay() #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 // private classes
@@ -186,6 +186,14 @@ wxFontRefData::~wxFontRefData()
// wxFont // 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() void wxFont::Init()
{ {
if ( wxTheFontList ) if ( wxTheFontList )