updates mostly for better font support and some weekly catch-up work

[wxWidgets.git] / include / wx / strconv.h

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index a329062f5cf37bcb6515cfe1496f93676c34f6a2..ba1e84d5791a126d156f99f61f5c70d160c36f52 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -58,19 +58,6 @@ public:
 
 WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
 
-// ----------------------------------------------------------------------------
-// wxMBConvFile (for conversion to filenames)
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxMBConvFile : 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;
-};
-
-WXDLLEXPORT_DATA(extern wxMBConvFile) wxConvFile;
-
 // ----------------------------------------------------------------------------
 // wxMBConvUTF7 (for conversion using UTF7 encoding)
 // ----------------------------------------------------------------------------
@@ -124,8 +111,11 @@ class WXDLLEXPORT wxCSConv : public wxMBConv
 {
 public:
     wxCSConv(const wxChar *charset);
+    wxCSConv(const wxCSConv& conv);
     virtual ~wxCSConv();
 
+    wxCSConv& operator=(const wxCSConv& conv);
+    
     void LoadNow();
 
     virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
@@ -143,6 +133,7 @@ private:
     bool m_deferred;
 };
 
+#define wxConvFile wxConvLocal
 WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;
 WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;