X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34da0970a018b4b0828248028040ca339868ed4e..4dba84be231243149a45a286a651d02be8487423:/src/msw/font.cpp?ds=sidebyside diff --git a/src/msw/font.cpp b/src/msw/font.cpp index 27370bf433..47f4ac63fa 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -30,12 +30,12 @@ #endif #include "wx/msw/private.h" -#include "assert.h" +#include #if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) -#if USE_PORTABLE_FONTS_IN_MSW +#if wxUSE_PORTABLE_FONTS_IN_MSW IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject) #endif @@ -192,7 +192,7 @@ bool wxFont::RealizeResource(void) // up fonts. So, set ppInch to a constant 96 dpi. ppInch = 96; -#if FONT_SIZE_COMPATIBILITY +#if wxFONT_SIZE_COMPATIBILITY // Incorrect, but compatible with old wxWindows behaviour int nHeight = (M_FONTDATA->m_pointSize*ppInch/72); #else