compilation fixes for wxMSW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-12-18 23:49:58 +00:00
parent 7826e2dd83
commit 76e23cdba3
8 changed files with 32 additions and 7 deletions

View File

@@ -29,7 +29,6 @@
#endif
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/setup.h"
#include "wx/list.h"
#include "wx/utils.h"
@@ -38,6 +37,8 @@
#include "wx/log.h"
#endif // WX_PRECOMP
#include "wx/fontutil.h"
#include "wx/msw/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
@@ -166,6 +167,19 @@ void wxFont::Init()
wxTheFontList->Append(this);
}
bool wxFont::Create(const wxNativeFontInfo& info)
{
return Create(info.pointSize, info.family, info.style, info.weight,
info.underlined, info.faceName, info.encoding);
}
wxFont::wxFont(const wxString& fontdesc)
{
wxNativeFontInfo info;
if ( info.FromString(fontdesc) )
(void)Create(info);
}
/* Constructor for a font. Note that the real construction is done
* in wxDC::SetFont, when information is available about scaling etc.
*/