X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b823f5a145f4823ce823591824855c34204936e4..420ec58abbf042de49ccde2253abd96dbc85c8ff:/src/msw/font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 8fd41f1b38..b615928b1a 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 <assert.h>
 
 #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
 
@@ -122,28 +122,28 @@ bool wxFont::RealizeResource(void)
     BYTE ff_italic;
     int ff_weight = 0;
     int ff_family = 0;
-    wxString ff_face("");
+    wxString ff_face(_T(""));
 
     switch (M_FONTDATA->m_family)
     {
       case wxSCRIPT:     ff_family = FF_SCRIPT ;
-                         ff_face = "Script" ;
+                         ff_face = _T("Script") ;
                          break ;
       case wxDECORATIVE: ff_family = FF_DECORATIVE;
                          break;
       case wxROMAN:      ff_family = FF_ROMAN;
-                         ff_face = "Times New Roman" ;
+                         ff_face = _T("Times New Roman") ;
                          break;
       case wxTELETYPE:
       case wxMODERN:     ff_family = FF_MODERN;
-                         ff_face = "Courier New" ;
+                         ff_face = _T("Courier New") ;
                          break;
       case wxSWISS:      ff_family = FF_SWISS;
-                         ff_face = "Arial";
+                         ff_face = _T("Arial") ;
                          break;
       case wxDEFAULT:
       default:           ff_family = FF_SWISS;
-                         ff_face = "Arial" ; 
+                         ff_face = _T("Arial") ; 
     }
 
     if (M_FONTDATA->m_style == wxITALIC || M_FONTDATA->m_style == wxSLANT)
@@ -158,13 +158,9 @@ bool wxFont::RealizeResource(void)
     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
@@ -196,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
@@ -208,9 +204,9 @@ 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));
+                PROOF_QUALITY, DEFAULT_PITCH | ff_family, pzFace);
 #ifdef WXDEBUG_CREATE
-    if (m_hFont==NULL) wxError("Cannot create font","Internal Error") ;
+    if (m_hFont==NULL) wxError(_T("Cannot create font"),_T("Internal Error")) ;
 #endif
     return (M_FONTDATA->m_hFont != (WXHFONT) NULL);
   }
@@ -236,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));
 }
@@ -312,29 +308,29 @@ void wxFont::SetUnderlined(bool underlined)
 
 wxString wxFont::GetFamilyString(void) const
 {
-  wxString fam("");
+  wxString fam(_T(""));
   switch (GetFamily())
   {
     case wxDECORATIVE:
-      fam = "wxDECORATIVE";
+      fam = _T("wxDECORATIVE");
       break;
     case wxROMAN:
-      fam = "wxROMAN";
+      fam = _T("wxROMAN");
       break;
     case wxSCRIPT:
-      fam = "wxSCRIPT";
+      fam = _T("wxSCRIPT");
       break;
     case wxSWISS:
-      fam = "wxSWISS";
+      fam = _T("wxSWISS");
       break;
     case wxMODERN:
-      fam = "wxMODERN";
+      fam = _T("wxMODERN");
       break;
     case wxTELETYPE:
-      fam = "wxTELETYPE";
+      fam = _T("wxTELETYPE");
       break;
     default:
-      fam = "wxDEFAULT";
+      fam = _T("wxDEFAULT");
       break;
   }
   return fam;
@@ -342,7 +338,7 @@ wxString wxFont::GetFamilyString(void) const
 
 wxString wxFont::GetFaceName(void) const
 {
-  wxString str("");
+  wxString str(_T(""));
   if (M_FONTDATA)
 	str = M_FONTDATA->m_faceName ;
   return str;
@@ -350,17 +346,17 @@ wxString wxFont::GetFaceName(void) const
 
 wxString wxFont::GetStyleString(void) const
 {
-  wxString styl("");
+  wxString styl(_T(""));
   switch (GetStyle())
   {
     case wxITALIC:
-      styl = "wxITALIC";
+      styl = _T("wxITALIC");
       break;
     case wxSLANT:
-      styl = "wxSLANT";
+      styl = _T("wxSLANT");
       break;
     default:
-      styl = "wxNORMAL";
+      styl = _T("wxNORMAL");
       break;
   }
   return styl;
@@ -368,17 +364,17 @@ wxString wxFont::GetStyleString(void) const
 
 wxString wxFont::GetWeightString(void) const
 {
-  wxString w("");
+  wxString w(_T(""));
   switch (GetWeight())
   {
     case wxBOLD:
-      w = "wxBOLD";
+      w = _T("wxBOLD");
       break;
     case wxLIGHT:
-      w = "wxLIGHT";
+      w = _T("wxLIGHT");
       break;
     default:
-      w = "wxNORMAL";
+      w = _T("wxNORMAL");
       break;
   }
   return w;