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

wxConvGdk is not used anymore

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-06 17:24:51 +00:00
parent 21a94f3018
commit 7af0846427
2 changed files with 0 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/strconv.h
View File

@@ -91,23 +91,6 @@ public:
WXDLLIMPEXP_DATA_BASE(extern wxMBConvUTF8) wxConvUTF8; WXDLLIMPEXP_DATA_BASE(extern wxMBConvUTF8) wxConvUTF8;
#ifdef __WXGTK12__
// ----------------------------------------------------------------------------
// wxMBConvUTF8 (for conversion using GDK's internal converions)
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxMBConvGdk : public wxMBConv
{
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;
};
WXDLLIMPEXP_DATA_BASE(extern wxMBConvGdk) wxConvGdk;
#endif // wxGTK 1.2
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxCSConv (for conversion based on loadable char sets) // wxCSConv (for conversion based on loadable char sets)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

42
src/common/strconv.cpp
View File

@@ -275,48 +275,6 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
return buf; return buf;
} }
// ----------------------------------------------------------------------------
// standard gdk conversion
// ----------------------------------------------------------------------------
#ifdef __WXGTK12__
WXDLLIMPEXP_DATA_BASE(wxMBConvGdk) wxConvGdk;
#include <gdk/gdk.h>
size_t wxMBConvGdk::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 wxMBConvGdk::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 // GTK > 1.0
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// UTF-7 // UTF-7
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------