X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f11220943f14b4bb5190db0dfd0054304f5015c..b3818fbe8e439bc9af8c20371774520a5a2bc9c7:/src/msw/font.cpp diff --git a/src/msw/font.cpp b/src/msw/font.cpp index 47f4ac63fa..a953351bae 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -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 @@ -232,7 +232,7 @@ WXHANDLE wxFont::GetResourceHandle() return (WXHANDLE)M_FONTDATA->m_hFont ; } -bool wxFont::IsFree() +bool wxFont::IsFree() const { return (M_FONTDATA && (M_FONTDATA->m_hFont == 0)); }