X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80df4d3169daf180af22992d46fcc12b61e4a64a..041973c55e06e98c724846d3ffac5e5284f07167:/include/wx/strconv.h diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 2b76ae9859..8a8cc13880 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -6,13 +6,13 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Ove Kaaven, Robert Roebling, Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_WXSTRCONVH__ #define _WX_WXSTRCONVH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "strconv.h" #endif @@ -20,6 +20,14 @@ #include "wx/wxchar.h" #include "wx/buffer.h" +#ifdef __DIGITALMARS__ +#include "typeinfo.h" +#endif + +#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 +# undef __BSEXCPT__ +#endif + #include #if wxUSE_WCHAR_T @@ -43,29 +51,19 @@ public: const wxWCharBuffer cMB2WX(const char *psz) const { return cMB2WC(psz); } const wxCharBuffer cWX2MB(const wchar_t *psz) const { return cWC2MB(psz); } const wchar_t* cWC2WX(const wchar_t *psz) const { return psz; } - const wchar_t* cMB2WC(const wchar_t *psz) const { return psz; } + const wchar_t* cWX2WC(const wchar_t *psz) const { return psz; } #else // ANSI const char* cMB2WX(const char *psz) const { return psz; } const char* cWX2MB(const char *psz) const { return psz; } const wxCharBuffer cWC2WX(const wchar_t *psz) const { return cWC2MB(psz); } const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); } #endif // Unicode/ANSI -}; -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; + // virtual dtor for any base class + virtual ~wxMBConv(); }; -WXDLLEXPORT_DATA(extern wxMBConvFile) wxConvFile; +WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc; // ---------------------------------------------------------------------------- // wxMBConvUTF7 (for conversion using UTF7 encoding) @@ -120,22 +118,31 @@ 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; virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const; + void Clear() ; + private: void SetName(const wxChar *charset); + // note that we can't use wxString here because of compilation + // dependencies: we're included from wx/string.h wxChar *m_name; wxCharacterSet *m_cset; bool m_deferred; }; +#define wxConvFile wxConvLocal WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal; +WXDLLEXPORT_DATA(extern wxCSConv) wxConvISO8859_1; WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent; // ---------------------------------------------------------------------------- @@ -143,7 +150,7 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent; // ---------------------------------------------------------------------------- // filenames are multibyte on Unix and probably widechar on Windows? -#if defined(__UNIX__) || defined(__BORLANDC__) +#if defined(__UNIX__) || defined(__BORLANDC__) || defined(__WXMAC__ ) #define wxMBFILES 1 #else #define wxMBFILES 0 @@ -171,7 +178,7 @@ public: const char* cWX2MB(const char *psz) const { return psz; } }; -WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile; +WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal, wxConvISO8859_1, wxConvUTF8; WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent; #define wxFNCONV(name) name