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

use wxCSConv instead of Win32 API

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-19 22:34:50 +00:00
parent 443c834d8d
commit 6a98321125
1 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/msw/textctrl.cpp
View File

@@ -686,9 +686,6 @@ wxRichEditStreamOut(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb)
} }
// from utils.cpp
extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding);
#if wxUSE_UNICODE_MSLU #if wxUSE_UNICODE_MSLU
#define UNUSED_IF_MSLU(param) #define UNUSED_IF_MSLU(param)
#else #else
@@ -703,37 +700,22 @@ wxTextCtrl::StreamIn(const wxString& value,
#if wxUSE_UNICODE_MSLU #if wxUSE_UNICODE_MSLU
const wchar_t *wpc = value.c_str(); const wchar_t *wpc = value.c_str();
#else // !wxUSE_UNICODE_MSLU #else // !wxUSE_UNICODE_MSLU
// we have to use EM_STREAMIN to force richedit control 2.0+ to show any wxCSConv conv(encoding);
// text in the non default charset -- otherwise it thinks it knows better
// than we do and always shows it in the default one
// first get the Windows code page for this encoding const size_t len = conv.MB2WC(NULL, value, value.length());
long codepage = wxEncodingToCodepage(encoding);
if ( codepage == -1 )
{
// unknown encoding
return FALSE;
}
// next translate to Unicode using this code page
int len = ::MultiByteToWideChar(codepage, 0, value, -1, NULL, 0);
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
wxWCharBuffer wchBuf(len); wxWCharBuffer wchBuf(len);
wchar_t *wpc = wchBuf.data();
#else #else
wchar_t *wchBuf = (wchar_t *)malloc((len + 1)*sizeof(wchar_t)); wchar_t *wchBuf = (wchar_t *)malloc((len + 1)*sizeof(wchar_t));
wchar_t *wpc = wchBuf;
#endif #endif
if ( !::MultiByteToWideChar(codepage, 0, value, -1, conv.MB2WC(wpc, value, value.length());
(wchar_t *)(const wchar_t *)wchBuf, len) )
{
wxLogLastError(_T("MultiByteToWideChar"));
}
// finally, stream it in the control
const wchar_t *wpc = wchBuf;
#endif // wxUSE_UNICODE_MSLU #endif // wxUSE_UNICODE_MSLU
// finally, stream it in the control
EDITSTREAM eds; EDITSTREAM eds;
wxZeroMemory(eds); wxZeroMemory(eds);
eds.dwCookie = (DWORD)&wpc; eds.dwCookie = (DWORD)&wpc;
@@ -872,6 +854,10 @@ void wxTextCtrl::DoWriteText(const wxString& value, bool selectionOnly)
wxFontEncoding encoding = font.GetEncoding(); wxFontEncoding encoding = font.GetEncoding();
if ( encoding != wxFONTENCODING_SYSTEM ) if ( encoding != wxFONTENCODING_SYSTEM )
{ {
// we have to use EM_STREAMIN to force richedit control 2.0+
// to show any text in the non default charset -- otherwise
// it thinks it knows better than we do and always shows it
// in the default one
done = StreamIn(valueDos, encoding, selectionOnly); done = StreamIn(valueDos, encoding, selectionOnly);
} }
} }