Updated release notes for 2.9.5.

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

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index 22b4a6210102a77a9887ae482a38cad9570261d8..f7c3952b154bc910f7f8ec572d95caf1c88486b3 100644 (file)
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/fontutil.cpp
+// Name:        src/msw/fontutil.cpp

 // Purpose:     font-related helper functions for wxMSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     font-related helper functions for wxMSW
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -24,19 +24,18 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/fontutil.h"
+

 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"

-    #include "wx/encinfo.h"

     #include "wx/wxcrtvararg.h"
     #include "wx/wxcrtvararg.h"

+    #include "wx/msw/private.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/msw/private.h"
-
-#include "wx/fontutil.h"
+#include "wx/encinfo.h"

 #include "wx/fontmap.h"
 #include "wx/fontmap.h"

-

 #include "wx/tokenzr.h"
 
 // for MSVC5 and old w32api
 #include "wx/tokenzr.h"
 
 // for MSVC5 and old w32api


@@ -57,7 +56,7 @@
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {

-    wxStringTokenizer tokenizer(s, _T(";"));
+    wxStringTokenizer tokenizer(s, wxT(";"));

 
     wxString encid = tokenizer.GetNextToken();
 
 
     wxString encid = tokenizer.GetNextToken();
 


@@ -96,7 +95,7 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
     }
     else
     {
     }
     else
     {

-        if ( wxSscanf(tmp, _T("%u"), &charset) != 1 )
+        if ( wxSscanf(tmp, wxT("%u"), &charset) != 1 )

         {
             // should be a number!
             return false;
         {
             // should be a number!
             return false;


@@ -120,12 +119,12 @@ wxString wxNativeEncodingInfo::ToString() const
       // we don't have any choice but to use the raw value
       << (long)encoding
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
       // 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 )
     {
 
     // ANSI_CHARSET is assumed anyhow
     if ( charset != ANSI_CHARSET )
     {

-         s << _T(';') << charset;
+         s << wxT(';') << charset;

     }
 
     return s;
     }
 
     return s;


@@ -138,7 +137,7 @@ wxString wxNativeEncodingInfo::ToString() const
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
 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 )
     {
 
     if ( encoding == wxFONTENCODING_DEFAULT )
     {


@@ -187,7 +186,7 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
     switch ( cs )
     {
         default:
     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:
             // fall through and assume the system charset
 
         case DEFAULT_CHARSET:


@@ -252,6 +251,14 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
             fontEncoding = wxFONTENCODING_CP950;
             break;
 
             fontEncoding = wxFONTENCODING_CP950;
             break;
 

+        case VIETNAMESE_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1258;
+            break;
+
+        case JOHAB_CHARSET:
+            fontEncoding = wxFONTENCODING_CP1361;
+            break;
+

 #endif // Win32
 
         case OEM_CHARSET:
 #endif // Win32
 
         case OEM_CHARSET: