Added SetOption,GetOption[Int] to wxSystemSettings. Made native MaskBlt optional.

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 6c376a95a6c505b4c88e3ec004ef6977a0dcfcd2..4fb77495a01020573dbd57ae6f56d9a5225d280d 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -94,9 +94,7 @@ typedef unsigned char size_t8;
             {
                 // Asserting a sizeof directly causes some compilers to
                 // issue a "using constant in a conditional expression" warning
             {
                 // Asserting a sizeof directly causes some compilers to
                 // issue a "using constant in a conditional expression" warning

-                size_t intsize = sizeof(int);
-
-                wxASSERT_MSG( intsize == 4,
+                wxASSERT_MSG( wxAssertIsEqual(sizeof(int), 4),

                               "size_t32 is incorrectly defined!" );
             }
         } intsizechecker;
                               "size_t32 is incorrectly defined!" );
             }
         } intsizechecker;


@@ -934,7 +932,7 @@ wxString wxLocale::GetSystemEncodingName()
 #ifdef __WIN32__
     // FIXME: what is the error return value for GetACP()?
     UINT codepage = ::GetACP();
 #ifdef __WIN32__
     // FIXME: what is the error return value for GetACP()?
     UINT codepage = ::GetACP();

-    encname.Printf(_T("cp%u"), codepage);
+    encname.Printf(_T("windows-%u"), codepage);

 #elif defined(__UNIX_LIKE__)
 
 #if defined(HAVE_LANGINFO_H) && defined(CODESET)
 #elif defined(__UNIX_LIKE__)
 
 #if defined(HAVE_LANGINFO_H) && defined(CODESET)