Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-27 14:59:35 +00:00
parent d5f8e9457b
commit 96ba157d97
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/univ/setup0.h
View File

@@ -199,7 +199,7 @@
// //
// Recommended setting: 1 for win32 else 0 // Recommended setting: 1 for win32 else 0
#if defined(__WIN32__) #if defined(__WIN32__)
#define wxUSE_WCHAR_T 0 //? unresolved external symbol wxCharsetToCodepage #define wxUSE_WCHAR_T 1
#else #else
#define wxUSE_WCHAR_T 0 #define wxUSE_WCHAR_T 0
#endif #endif

8
src/common/strconv.cpp
View File

@@ -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__ #ifdef __WXWINE__
#define WINE_CAST (WCHAR *) #define WINE_CAST (WCHAR *)
@@ -842,7 +842,7 @@ public:
public: public:
long m_CodePage; 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); cset = new CP_CharSet(name);
if ( cset->usable() ) if ( cset->usable() )
return cset; return cset;
delete cset; delete cset;
cset = NULL; cset = NULL;
#endif // __WIN32__ #endif // defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXUNIVERSAL__)
#if wxUSE_FONTMAP #if wxUSE_FONTMAP
cset = new EC_CharSet(name); cset = new EC_CharSet(name);