X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..14ba694c26bb7bdf3d75db9d3dc85774e5a8d126:/src/msw/fontutil.cpp

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index 1cc59c3cf7..5bacd8241e 100644
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -6,7 +6,7 @@
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "fontutil.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -33,6 +29,7 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/encinfo.h"
+    #include "wx/wxcrtvararg.h"
 #endif //WX_PRECOMP
 
 #include "wx/msw/private.h"
@@ -60,7 +57,7 @@
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
-    wxStringTokenizer tokenizer(s, _T(";"));
+    wxStringTokenizer tokenizer(s, wxT(";"));
 
     wxString encid = tokenizer.GetNextToken();
 
@@ -99,14 +96,14 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
     }
     else
     {
-        if ( wxSscanf(tmp, _T("%u"), &charset) != 1 )
+        if ( wxSscanf(tmp, wxT("%u"), &charset) != 1 )
         {
             // should be a number!
-            return FALSE;
+            return false;
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 wxString wxNativeEncodingInfo::ToString() const
@@ -123,12 +120,12 @@ wxString wxNativeEncodingInfo::ToString() const
       // we don't have any choice but to use the raw value
       << (long)encoding
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
-      << _T(';') << facename;
+      << wxT(';') << facename;
 
     // ANSI_CHARSET is assumed anyhow
     if ( charset != ANSI_CHARSET )
     {
-         s << _T(';') << charset;
+         s << wxT(';') << charset;
     }
 
     return s;
@@ -141,7 +138,7 @@ wxString wxNativeEncodingInfo::ToString() const
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
-    wxCHECK_MSG( info, FALSE, _T("bad pointer in wxGetNativeFontEncoding") );
+    wxCHECK_MSG( info, false, wxT("bad pointer in wxGetNativeFontEncoding") );
 
     if ( encoding == wxFONTENCODING_DEFAULT )
     {
@@ -151,11 +148,11 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
     extern WXDLLIMPEXP_BASE long wxEncodingToCharset(wxFontEncoding encoding);
     info->charset = wxEncodingToCharset(encoding);
     if ( info->charset == -1 )
-        return FALSE;
+        return false;
 
     info->encoding = encoding;
 
-    return TRUE;
+    return true;
 }
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
@@ -164,19 +161,19 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
     LOGFONT lf;
     wxZeroMemory(lf);       // all default values
 
-    lf.lfCharSet = info.charset;
-    wxStrncpy(lf.lfFaceName, info.facename, WXSIZEOF(lf.lfFaceName));
+    lf.lfCharSet = (BYTE)info.charset;
+    wxStrlcpy(lf.lfFaceName, info.facename.c_str(), WXSIZEOF(lf.lfFaceName));
 
     HFONT hfont = ::CreateFontIndirect(&lf);
     if ( !hfont )
     {
         // no such font
-        return FALSE;
+        return false;
     }
 
     ::DeleteObject((HGDIOBJ)hfont);
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -190,7 +187,7 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
     switch ( cs )
     {
         default:
-            wxFAIL_MSG( _T("unexpected Win32 charset") );
+            wxFAIL_MSG( wxT("unexpected Win32 charset") );
             // fall through and assume the system charset
 
         case DEFAULT_CHARSET:
@@ -236,7 +233,7 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
             break;
 
         case THAI_CHARSET:
-            fontEncoding = wxFONTENCODING_CP437;
+            fontEncoding = wxFONTENCODING_CP874;
             break;
 
         case SHIFTJIS_CHARSET: