removing path corrections for wxMac, we now want a correct platform string for unzOpen

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 0610b43452534e869dd698de841d1be5cff40cd4..b15169ac547b7aa32b4aa37ce31c0a318211b524 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -782,13 +782,7 @@ size_t IC_CharSet::WC2MB(char *buf, const wchar_t *psz, size_t n)
 // 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
 
@@ -809,7 +803,7 @@ public:
                                 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
                              );
 
@@ -824,7 +818,7 @@ public:
                              (
                                 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
@@ -842,7 +836,7 @@ public:
 public:
     long m_CodePage;
 };
-#endif // __WIN32__
+#endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)
 
 // ============================================================================
 // wxEncodingConverter based conversion classes
@@ -942,14 +936,14 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
         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;
-#endif // __WIN32__
+#endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)
 
 #if wxUSE_FONTMAP
     cset = new EC_CharSet(name);