X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/873fd4af5f9ed1f078636af1ae9ea21bbed06b5a..cf283a470ab3eb4bc69959e3b5ae0edf30337fa5:/src/os2/font.cpp diff --git a/src/os2/font.cpp b/src/os2/font.cpp index 61db533606..4ed240007c 100644 --- a/src/os2/font.cpp +++ b/src/os2/font.cpp @@ -297,7 +297,7 @@ protected: bool m_bInternalPS; // Internally generated PS? }; // end of CLASS wxFontRefData -#define M_FONTDATA (wxFontRefData*)m_refData) +#define M_FONTDATA ((wxFontRefData*)m_refData) // ============================================================================ // implementation @@ -857,7 +857,7 @@ wxString wxNativeFontInfo::ToString() const fa.usCodePage, fa.lMatch, fn.usWeightClass, - fa.szFacename); + (char *)fa.szFacename); return sStr; } // end of wxNativeFontInfo::ToString