From 7af0846427683d08c44b5d88f39c932ace31843c Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 6 Jul 2003 17:24:51 +0000 Subject: [PATCH] wxConvGdk is not used anymore git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/strconv.h | 17 ----------------- src/common/strconv.cpp | 42 ------------------------------------------ 2 files changed, 59 deletions(-) diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 384a4b3769..dd127751dd 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -91,23 +91,6 @@ public: 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) // ---------------------------------------------------------------------------- diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 29710e6d04..7e7b6efff5 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -275,48 +275,6 @@ const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const return buf; } -// ---------------------------------------------------------------------------- -// standard gdk conversion -// ---------------------------------------------------------------------------- - -#ifdef __WXGTK12__ - -WXDLLIMPEXP_DATA_BASE(wxMBConvGdk) wxConvGdk; - -#include - -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 // ---------------------------------------------------------------------------- -- 2.47.2