Fixed windows installer to not need a reboot and therefore not have

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index c7a304f445f675178920854be508769c25890c2d..50daad4e83410e83e6133c219851c41509a4fe33 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -200,7 +200,7 @@ bool wxFont::RealizeResource()
     {
         // VZ: the old code returned FALSE in this case, but it doesn't seem
         //     to make sense because the font _was_ created
-        wxLogDebug(_T("Calling wxFont::RealizeResource() twice"));
+        wxLogDebug(wxT("Calling wxFont::RealizeResource() twice"));
 
         return TRUE;
     }
@@ -212,7 +212,7 @@ bool wxFont::RealizeResource()
     {
         case wxSCRIPT:
             ff_family = FF_SCRIPT ;
-            ff_face = _T("Script") ;
+            ff_face = wxT("Script") ;
             break ;
 
         case wxDECORATIVE:
@@ -221,24 +221,24 @@ bool wxFont::RealizeResource()
 
         case wxROMAN:
             ff_family = FF_ROMAN;
-            ff_face = _T("Times New Roman") ;
+            ff_face = wxT("Times New Roman") ;
             break;
 
         case wxTELETYPE:
         case wxMODERN:
             ff_family = FF_MODERN;
-            ff_face = _T("Courier New") ;
+            ff_face = wxT("Courier New") ;
             break;
 
         case wxSWISS:
             ff_family = FF_SWISS;
-            ff_face = _T("Arial") ;
+            ff_face = wxT("Arial") ;
             break;
 
         case wxDEFAULT:
         default:
             ff_family = FF_SWISS;
-            ff_face = _T("Arial") ; 
+            ff_face = wxT("Arial") ; 
     }
 
     BYTE ff_italic;
@@ -250,7 +250,7 @@ bool wxFont::RealizeResource()
             break;
 
         default:
-            wxFAIL_MSG(_T("unknown font slant"));
+            wxFAIL_MSG(wxT("unknown font slant"));
             // fall through
 
         case wxNORMAL:
@@ -261,7 +261,7 @@ bool wxFont::RealizeResource()
     switch ( M_FONTDATA->m_weight )
     {
         default:
-            wxFAIL_MSG(_T("unknown font weight"));
+            wxFAIL_MSG(wxT("unknown font weight"));
             // fall through
 
         case wxNORMAL:
@@ -342,7 +342,7 @@ bool wxFont::RealizeResource()
         case wxFONTENCODING_CP1250:
             charset = ANSI_CHARSET;
             break;
-
+#if !defined(__WIN16__)
         case wxFONTENCODING_ISO8859_2:
         case wxFONTENCODING_CP1252:
             charset = EASTEUROPE_CHARSET;
@@ -377,13 +377,14 @@ bool wxFont::RealizeResource()
         case wxFONTENCODING_ISO8859_11:
             charset = THAI_CHARSET;
             break;
+#endif // BC++ 16-bit
 
         case wxFONTENCODING_CP437:
             charset = OEM_CHARSET;
             break;
 
         default:
-            wxFAIL_MSG(_T("unsupported encoding"));
+            wxFAIL_MSG(wxT("unsupported encoding"));
             // fall through
 
         case wxFONTENCODING_SYSTEM: