A few weeks of Unicode fixes (my old win95 laptop compiles sloowly,

especially when through the nullmodem cable).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-06-14 14:39:11 +00:00
parent 5f8e1c164d
commit 837e57436a
67 changed files with 778 additions and 763 deletions

View File

@@ -158,9 +158,9 @@ bool wxFont::RealizeResource(void)
else if (M_FONTDATA->m_weight == wxBOLD)
ff_weight = FW_BOLD;
const char* pzFace = (const char*) ff_face;
const wxChar* pzFace = (const wxChar*) ff_face;
if (!M_FONTDATA->m_faceName.IsNull())
pzFace = (const char*) M_FONTDATA->m_faceName ;
pzFace = (const wxChar*) M_FONTDATA->m_faceName ;
/* Always calculate fonts using the screen DC (is this the best strategy?)
* There may be confusion if a font is selected into a printer