AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxConv classes and instances, including wxConv_gdk.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven 1999-04-14 14:37:54 +00:00
parent d41bba9157
commit ba555d51b0
1 changed files with 59 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/common/string.cpp
View File

@ -1788,12 +1788,12 @@ void wxArrayString::DoSort()
// MBConv // MBConv
// ============================================================================ // ============================================================================
WXDLLEXPORT_DATA(wxMBConv) wxConv_libc;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// standard libc conversion // standard libc conversion
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WXDLLEXPORT_DATA(wxMBConv) wxConv_libc;
size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
return wxMB2WC(buf, psz, n); return wxMB2WC(buf, psz, n);
@ -1804,19 +1804,62 @@ size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
return wxWC2MB(buf, psz, n); return wxWC2MB(buf, psz, n);
} }
// ----------------------------------------------------------------------------
// standard file conversion
// ----------------------------------------------------------------------------
WXDLLEXPORT_DATA(wxMBConv_file) wxConv_file;
// just use the libc conversion for now
size_t wxMBConv_file::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
return wxMB2WC(buf, psz, n);
}
size_t wxMBConv_file::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
return wxWC2MB(buf, psz, n);
}
// ----------------------------------------------------------------------------
// standard gdk conversion
// ----------------------------------------------------------------------------
#ifdef __WXGTK__
WXDLLEXPORT_DATA(wxMBConv_gdk) wxConv_gdk;
#include <gdk/gdk.h>
size_t wxMBConv_gdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{
if (buf) {
return gdk_mbstowcs((GdkWChar *)buf, psz, n);
} else {
GdkWChar *nbuf = new GdkWChar[n=strlen(psz)];
size_t len = gdk_mbstowcs(nbuf, psz, n);
delete [] nbuf;
return len;
}
}
size_t wxMBConv_gdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
{
char *mbstr = gdk_wcstombs((GdkWChar *)psz);
size_t len = mbstr ? strlen(mbstr) : 0;
if (buf) {
if (len > n) len = n;
memcpy(buf, psz, len);
if (len < n) buf[len] = 0;
}
return len;
}
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// UTF-7 // UTF-7
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxMBConv_UTF7 WXDLLEXPORT_DATA(wxMBConv_UTF7) wxConv_UTF7;
{
public:
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
};
// WXDLLEXPORT_DATA(wxMBConv_UTF7) wxConv_UTF7;
WXDLLEXPORT_DATA(wxMBConv) wxConv_UTF7;
// TODO: write actual implementations of UTF-7 here // TODO: write actual implementations of UTF-7 here
size_t wxMBConv_UTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConv_UTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
@ -1833,15 +1876,7 @@ size_t wxMBConv_UTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
// UTF-8 // UTF-8
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxMBConv_UTF8 WXDLLEXPORT_DATA(wxMBConv_UTF8) wxConv_UTF8;
{
public:
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
};
// WXDLLEXPORT_DATA(wxMBConv_UTF8) wxConv_UTF8;
WXDLLEXPORT_DATA(wxMBConv) wxConv_UTF8;
// TODO: write actual implementations of UTF-8 here // TODO: write actual implementations of UTF-8 here
size_t wxMBConv_UTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxMBConv_UTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
@ -1864,6 +1899,10 @@ wxCSConv::wxCSConv(const wxChar *charset)
data = (wxChar *) NULL; data = (wxChar *) NULL;
} }
wxCSConv::~wxCSConv(void)
{
}
size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
{ {
if (buf && !data) { if (buf && !data) {