MingW32 compilation works now.

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 8fd41f1b384ef4d6fd77bd293ad5c0317466b441..a953351bae695b6347e7dafa5de724e64318ae50 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -30,12 +30,12 @@
 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

-#include "assert.h"
+#include <assert.h>

 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 
 #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
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
 #endif
 


@@ -158,13 +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;
 

-#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;
-       if ( ff_face.IsNull() )
-               ff_face = "";
-#endif
+    const wxChar* pzFace = (const wxChar*) ff_face;
+    if (!M_FONTDATA->m_faceName.IsNull())
+        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


@@ -196,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


@@ -208,7 +204,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,
 
     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));
+                PROOF_QUALITY, DEFAULT_PITCH | ff_family, pzFace);

 #ifdef WXDEBUG_CREATE
     if (m_hFont==NULL) wxError("Cannot create font","Internal Error") ;
 #endif
 #ifdef WXDEBUG_CREATE
     if (m_hFont==NULL) wxError("Cannot create font","Internal Error") ;
 #endif


@@ -236,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));
 }