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

Lots more Unicode fixes.

Browse Source 
wxClipboard fixes for GTK2 and UTF8.
  wxFileConfig now uses wxConvLocal to convert text
    and doesn't crash anymore..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-08-19 17:02:10 +00:00
parent 127328cdd3
commit ca11abde11
9 changed files with 76 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/strconv.cpp
View File

@@ -67,7 +67,7 @@ public:
virtual void OnExit()
{
#if wxUSE_WCHAR_T
wxConvLocal.Clear();
wxConvLocal.Clear();
#endif
}
@@ -195,7 +195,6 @@ size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
for (size_t i = 0; i < strlen( psz )+1; i++)
buf[i] = (wchar_t) psz[i];
// printf( "libc %s\n", buf );
return strlen( psz );
}
else
@@ -214,7 +213,6 @@ size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
for (size_t i = 0; i < wxStrlen( psz )+1; i++)
buf[i] = (char) psz[i];
// printf( "libc %s\n", buf );
return wxStrlen( psz );
}
else
@@ -250,7 +248,6 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *psz) const
return wxCharBuffer((char *) NULL);
wxCharBuffer buf(nLen); // this allocates nLen+1
WC2MB((char *)(const char *) buf, psz, nLen+1);
// printf( "str %s\n", (const char*) buf );
return buf;
}
else
@@ -911,15 +908,6 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
cset = NULL;
}
#if defined(__WIN32__) && !defined(__WXMICROWIN__)
cset = new CP_CharSet(name);
if ( cset->usable() )
return cset;
delete cset;
cset = NULL;
#endif // __WIN32__
#if wxUSE_FONTMAP
cset = new EC_CharSet(name);
if ( cset->usable() )
@@ -929,6 +917,15 @@ static wxCharacterSet *wxGetCharacterSet(const wxChar *name)
cset = NULL;
#endif // wxUSE_FONTMAP
#if defined(__WIN32__) && !defined(__WXMICROWIN__)
cset = new CP_CharSet(name);
if ( cset->usable() )
return cset;
delete cset;
cset = NULL;
#endif // __WIN32__
wxLogError(_("Cannot convert from encoding '%s'!"), name);
return NULL;