wxConvGdk is not used anymore

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 384a4b3769c6d763f7b6e64c0618a24adb1985cb..dd127751ddd7e30f2a7bf0dd18b54753fb9ea41d 100644 (file)
--- 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 29710e6d04c1705f6c29f0fff7957cbd28917fb7..7e7b6efff5a4af91f0e8e3f210dcd08500954784 100644 (file)
--- 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 <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
 // ----------------------------------------------------------------------------