better update rect calculation

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 1ef70b48b4fe2da5961b0dba7c818bf006e27493..a953351bae695b6347e7dafa5de724e64318ae50 100644 (file)
--- 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;
 
     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())
     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
 
 /* Always calculate fonts using the screen DC (is this the best strategy?)
  * There may be confusion if a font is selected into a printer


@@ -192,7 +192,7 @@ bool wxFont::RealizeResource(void)
     // up fonts. So, set ppInch to a constant 96 dpi.
     ppInch = 96;
     
     // 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
     // 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 ;
 }
 
     return (WXHANDLE)M_FONTDATA->m_hFont ;
 }
 

-bool wxFont::IsFree()
+bool wxFont::IsFree() const

 {
   return (M_FONTDATA && (M_FONTDATA->m_hFont == 0));
 }
 {
   return (M_FONTDATA && (M_FONTDATA->m_hFont == 0));
 }