Added wxWindowBase::CentreOnParent to allow top level windows to be

[wxWidgets.git] / src / msw / font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index da43d01faccd2fc78d1f56b096a585b5de7e36fe..d6c84ee3b6d5a2812f88d9a46ac07c1c425e3c89 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -30,7 +30,7 @@
 #endif
 
 #include "wx/msw/private.h"
-#include "assert.h"
+#include <assert.h>
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
@@ -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
@@ -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));
 }