Applied patch [ 1374215 ] Bug fix to wxSpinCtrl for Windows

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

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index 6bea2a9a399cf35b6e07b1a8cee4731cbf28f886..a1b318d725b52882ef44d5909ae4aa4555bd6bb5 100644 (file)
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -102,11 +98,11 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
         if ( wxSscanf(tmp, _T("%u"), &charset) != 1 )
         {
             // should be a number!
         if ( wxSscanf(tmp, _T("%u"), &charset) != 1 )
         {
             // should be a number!

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 wxString wxNativeEncodingInfo::ToString() const
 }
 
 wxString wxNativeEncodingInfo::ToString() const


@@ -141,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, _T("bad pointer in wxGetNativeFontEncoding") );

 
     if ( encoding == wxFONTENCODING_DEFAULT )
     {
 
     if ( encoding == wxFONTENCODING_DEFAULT )
     {


@@ -151,11 +147,11 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
     extern WXDLLIMPEXP_BASE long wxEncodingToCharset(wxFontEncoding encoding);
     info->charset = wxEncodingToCharset(encoding);
     if ( info->charset == -1 )
     extern WXDLLIMPEXP_BASE long wxEncodingToCharset(wxFontEncoding encoding);
     info->charset = wxEncodingToCharset(encoding);
     if ( info->charset == -1 )

-        return FALSE;
+        return false;

 
     info->encoding = encoding;
 
 
     info->encoding = encoding;
 

-    return TRUE;
+    return true;

 }
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 }
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)


@@ -164,19 +160,19 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
     LOGFONT lf;
     wxZeroMemory(lf);       // all default values
 
     LOGFONT lf;
     wxZeroMemory(lf);       // all default values
 

-    lf.lfCharSet = info.charset;
+    lf.lfCharSet = (BYTE)info.charset;

     wxStrncpy(lf.lfFaceName, info.facename, WXSIZEOF(lf.lfFaceName));
 
     HFONT hfont = ::CreateFontIndirect(&lf);
     if ( !hfont )
     {
         // no such font
     wxStrncpy(lf.lfFaceName, info.facename, WXSIZEOF(lf.lfFaceName));
 
     HFONT hfont = ::CreateFontIndirect(&lf);
     if ( !hfont )
     {
         // no such font

-        return FALSE;
+        return false;

     }
 
     ::DeleteObject((HGDIOBJ)hfont);
 
     }
 
     ::DeleteObject((HGDIOBJ)hfont);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -190,7 +186,10 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
     switch ( cs )
     {
         default:
     switch ( cs )
     {
         default:

-            // assume the system charset
+            wxFAIL_MSG( _T("unexpected Win32 charset") );
+            // fall through and assume the system charset
+
+        case DEFAULT_CHARSET:

             fontEncoding = wxFONTENCODING_SYSTEM;
             break;
 
             fontEncoding = wxFONTENCODING_SYSTEM;
             break;
 


@@ -198,6 +197,11 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
             fontEncoding = wxFONTENCODING_CP1252;
             break;
 
             fontEncoding = wxFONTENCODING_CP1252;
             break;
 

+        case SYMBOL_CHARSET:
+            // what can we do here?
+            fontEncoding = wxFONTENCODING_MAX;
+            break;
+

 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
         case EASTEUROPE_CHARSET:
             fontEncoding = wxFONTENCODING_CP1250;
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
         case EASTEUROPE_CHARSET:
             fontEncoding = wxFONTENCODING_CP1250;


@@ -228,7 +232,7 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
             break;
 
         case THAI_CHARSET:
             break;
 
         case THAI_CHARSET:

-            fontEncoding = wxFONTENCODING_CP437;
+            fontEncoding = wxFONTENCODING_CP874;

             break;
 
         case SHIFTJIS_CHARSET:
             break;
 
         case SHIFTJIS_CHARSET: