compilation fix (?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
080b749f7d
commit
98c9fc2d06
@ -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,
|
||||
|
@ -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 )
|
||||
|
Loading…
Reference in New Issue
Block a user