X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..54ff4a701f6c83aad8387a31b652f209681210cb:/src/msw/font.cpp diff --git a/src/msw/font.cpp b/src/msw/font.cpp index 48a127d8f9..66a9fdbb79 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -146,7 +146,7 @@ bool wxFont::RealizeResource(void) else if (M_FONTDATA->m_weight == wxBOLD) ff_weight = FW_BOLD; -#if defined(__X__) || (defined(__WINDOWS__) && USE_PORTABLE_FONTS_IN_MSW) +#if defined(__X__) || (defined(__WXMSW__) && USE_PORTABLE_FONTS_IN_MSW) ff_face = wxTheFontNameDirectory.GetScreenName(M_FONTDATA->m_family, M_FONTDATA->m_weight, M_FONTDATA->m_style); #else ff_face = M_FONTDATA->m_faceName; @@ -197,7 +197,7 @@ bool wxFont::RealizeResource(void) M_FONTDATA->m_hFont = (WXHFONT) CreateFont(nHeight, 0, 0, 0,ff_weight,ff_italic,(BYTE)ff_underline, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, DEFAULT_PITCH | ff_family, (ff_face == "" ? NULL : (const char *)ff_face)); -#ifdef DEBUG_CREATE +#ifdef WXDEBUG_CREATE if (m_hFont==NULL) wxError("Cannot create font","Internal Error") ; #endif return (M_FONTDATA->m_hFont != (WXHFONT) NULL);