Applied patch [ 658786 ] Removes unresolved symbols from strconv (wxUniv/MSW)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index e1135cbb11466a7886286c20da649a8bdff09f3f..1b0e39bbefaa804f87282e7e9bacf0d4b08c4c17 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -199,7 +199,7 @@
 //
 // Recommended setting: 1 for win32 else 0
 #if defined(__WIN32__)
 //
 // Recommended setting: 1 for win32 else 0
 #if defined(__WIN32__)

-    #define wxUSE_WCHAR_T 0 //? unresolved external symbol wxCharsetToCodepage
+    #define wxUSE_WCHAR_T 1

 #else
     #define wxUSE_WCHAR_T 0
 #endif
 #else
     #define wxUSE_WCHAR_T 0
 #endif

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 0610b43452534e869dd698de841d1be5cff40cd4..a868a4a2adf1f8ac4c8a41da311b83243a557aad 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -782,7 +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__)
+#if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)

 
 #ifdef __WXWINE__
     #define WINE_CAST (WCHAR *)
 
 #ifdef __WXWINE__
     #define WINE_CAST (WCHAR *)


@@ -842,7 +842,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 +942,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);