moved OLE files group under MSW files -- this is more logical

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 59fdd4af985bfbac0e21586dc875a6ec35378ea0..b15169ac547b7aa32b4aa37ce31c0a318211b524 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -456,7 +456,7 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
     }
 
     if (buf && (len<n)) *buf = 0;
     }
 
     if (buf && (len<n)) *buf = 0;

-    
+

     return len;
 }
 
     return len;
 }
 


@@ -678,7 +678,7 @@ size_t IC_CharSet::MB2WC(wchar_t *buf, const char *psz, size_t n)
             // convert to native endianness
             WC_BSWAP(buf /* _not_ bufPtr */, res)
         }
             // convert to native endianness
             WC_BSWAP(buf /* _not_ bufPtr */, res)
         }

-        
+

         // NB: iconv was given only strlen(psz) characters on input, and so
         //     it couldn't convert the trailing zero. Let's do it ourselves
         //     if there's some room left for it in the output buffer.
         // NB: iconv was given only strlen(psz) characters on input, and so
         //     it couldn't convert the trailing zero. Let's do it ourselves
         //     if there's some room left for it in the output buffer.


@@ -739,7 +739,7 @@ size_t IC_CharSet::WC2MB(char *buf, const wchar_t *psz, size_t n)
         cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
 
         res = n-outbuf;
         cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
 
         res = n-outbuf;

-        
+

         // NB: iconv was given only wcslen(psz) characters on input, and so
         //     it couldn't convert the trailing zero. Let's do it ourselves
         //     if there's some room left for it in the output buffer.
         // NB: iconv was given only wcslen(psz) characters on input, and so
         //     it couldn't convert the trailing zero. Let's do it ourselves
         //     if there's some room left for it in the output buffer.


@@ -782,13 +782,7 @@ size_t IC_CharSet::WC2MB(char *buf, const wchar_t *psz, size_t n)
 // Win32 conversion classes
 // ============================================================================
 
 // Win32 conversion classes
 // ============================================================================
 

-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-
-#ifdef __WXWINE__
-    #define WINE_CAST (WCHAR *)
-#else
-    #define WINE_CAST
-#endif
+#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)

 
 extern long wxCharsetToCodepage(const wxChar *charset); // from utils.cpp
 
 
 extern long wxCharsetToCodepage(const wxChar *charset); // from utils.cpp
 


@@ -809,7 +803,7 @@ public:
                                 0,              // flags (none)
                                 psz,            // input string
                                 -1,             // its length (NUL-terminated)
                                 0,              // flags (none)
                                 psz,            // input string
                                 -1,             // its length (NUL-terminated)

-                                WINE_CAST buf,  // output string
+                                buf,            // output string

                                 buf ? n : 0     // size of output buffer
                              );
 
                                 buf ? n : 0     // size of output buffer
                              );
 


@@ -824,7 +818,7 @@ public:
                              (
                                 m_CodePage,     // code page
                                 0,              // flags (none)
                              (
                                 m_CodePage,     // code page
                                 0,              // flags (none)

-                                WINE_CAST psz,  // input string
+                                psz,            // input string

                                 -1,             // it is (wide) NUL-terminated
                                 buf,            // output buffer
                                 buf ? n : 0,    // and its size
                                 -1,             // it is (wide) NUL-terminated
                                 buf,            // output buffer
                                 buf ? n : 0,    // and its size


@@ -842,7 +836,7 @@ public:
 public:
     long m_CodePage;
 };
 public:
     long m_CodePage;
 };

-#endif // __WIN32__
+#endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)

 
 // ============================================================================
 // wxEncodingConverter based conversion classes
 
 // ============================================================================
 // wxEncodingConverter based conversion classes


@@ -942,14 +936,14 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
         cset = NULL;
     }
 
         cset = NULL;
     }
 

-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)

     cset = new CP_CharSet(name);
     if ( cset->usable() )
         return cset;
 
     delete cset;
     cset = NULL;
     cset = new CP_CharSet(name);
     if ( cset->usable() )
         return cset;
 
     delete cset;
     cset = NULL;

-#endif // __WIN32__
+#endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)

 
 #if wxUSE_FONTMAP
     cset = new EC_CharSet(name);
 
 #if wxUSE_FONTMAP
     cset = new EC_CharSet(name);


@@ -1018,8 +1012,11 @@ void wxCSConv::SetName(const wxChar *charset)
 
 void wxCSConv::LoadNow()
 {
 
 void wxCSConv::LoadNow()
 {

-    if (m_deferred)
+    if ( m_deferred )

     {
     {

+        // it would probably be better to make GetSystemEncodingName() always
+        // available (i.e. even when wxUSE_INTL == 0)?
+#if wxUSE_INTL

         if ( !m_name )
         {
             wxString name = wxLocale::GetSystemEncodingName();
         if ( !m_name )
         {
             wxString name = wxLocale::GetSystemEncodingName();


@@ -1028,6 +1025,7 @@ void wxCSConv::LoadNow()
                 SetName(name);
             }
         }
                 SetName(name);
             }
         }

+#endif // wxUSE_INTL

 
         // wxGetCharacterSet() complains about NULL name
         m_cset = m_name ? wxGetCharacterSet(m_name) : NULL;
 
         // wxGetCharacterSet() complains about NULL name
         m_cset = m_name ? wxGetCharacterSet(m_name) : NULL;