compilation fixes

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 2b76ae98591480918d7617c682d9c066ff2e1fae..dd127751ddd7e30f2a7bf0dd18b54753fb9ea41d 100644 (file)
--- 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
 // 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__
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WXSTRCONVH__
 #define _WX_WXSTRCONVH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

   #pragma interface "strconv.h"
 #endif
 
   #pragma interface "strconv.h"
 #endif
 


@@ -20,6 +20,14 @@
 #include "wx/wxchar.h"
 #include "wx/buffer.h"
 
 #include "wx/wxchar.h"
 #include "wx/buffer.h"
 

+#ifdef __DIGITALMARS__
+#include "typeinfo.h"
+#endif
+
+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+#  undef __BSEXCPT__
+#endif
+

 #include <stdlib.h>
 
 #if wxUSE_WCHAR_T
 #include <stdlib.h>
 
 #if wxUSE_WCHAR_T


@@ -28,7 +36,7 @@
 // wxMBConv (base class for conversions, using libc conversion itself)
 // ----------------------------------------------------------------------------
 
 // wxMBConv (base class for conversions, using libc conversion itself)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMBConv
+class WXDLLIMPEXP_BASE wxMBConv

 {
 public:
     // the actual conversion takes place here
 {
 public:
     // the actual conversion takes place here


@@ -43,107 +51,89 @@ 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 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
 #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;
+WXDLLIMPEXP_DATA_BASE(extern wxMBConv) wxConvLibc;

 
 // ----------------------------------------------------------------------------
 // wxMBConvUTF7 (for conversion using UTF7 encoding)
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxMBConvUTF7 (for conversion using UTF7 encoding)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMBConvUTF7 : public wxMBConv
+class WXDLLIMPEXP_BASE wxMBConvUTF7 : 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;
 };
 
 {
 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 wxMBConvUTF7) wxConvUTF7;
+WXDLLIMPEXP_DATA_BASE(extern wxMBConvUTF7) wxConvUTF7;

 
 // ----------------------------------------------------------------------------
 // wxMBConvUTF8 (for conversion using UTF8 encoding)
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxMBConvUTF8 (for conversion using UTF8 encoding)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMBConvUTF8 : public wxMBConv
+class WXDLLIMPEXP_BASE wxMBConvUTF8 : 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;
 };
 
 {
 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 wxMBConvUTF8) wxConvUTF8;
-
-#ifdef __WXGTK12__
-
-// ----------------------------------------------------------------------------
-// wxMBConvUTF8 (for conversion using GDK's internal converions)
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT 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;
-};
-
-WXDLLEXPORT_DATA(extern wxMBConvGdk) wxConvGdk;
-
-#endif // wxGTK 1.2
+WXDLLIMPEXP_DATA_BASE(extern wxMBConvUTF8) wxConvUTF8;

 
 // ----------------------------------------------------------------------------
 // wxCSConv (for conversion based on loadable char sets)
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxCSConv (for conversion based on loadable char sets)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxCharacterSet;
+class WXDLLIMPEXP_BASE wxCharacterSet;

 
 

-class WXDLLEXPORT wxCSConv : public wxMBConv
+class WXDLLIMPEXP_BASE wxCSConv : public wxMBConv

 {
 public:
     wxCSConv(const wxChar *charset);
 {
 public:
     wxCSConv(const wxChar *charset);

+    wxCSConv(const wxCSConv& conv);

     virtual ~wxCSConv();
 
     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 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);
 
 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;
 };
 
     wxChar *m_name;
     wxCharacterSet *m_cset;
     bool m_deferred;
 };
 

-WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;
-WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
+#define wxConvFile wxConvLocal
+WXDLLIMPEXP_DATA_BASE(extern wxCSConv) wxConvLocal;
+WXDLLIMPEXP_DATA_BASE(extern wxCSConv) wxConvISO8859_1;
+WXDLLIMPEXP_DATA_BASE(extern wxMBConv *) wxConvCurrent;

 
 // ----------------------------------------------------------------------------
 // filename conversion macros
 // ----------------------------------------------------------------------------
 
 // filenames are multibyte on Unix and probably widechar on Windows?
 
 // ----------------------------------------------------------------------------
 // filename conversion macros
 // ----------------------------------------------------------------------------
 
 // 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
     #define wxMBFILES 1
 #else
     #define wxMBFILES 0


@@ -164,15 +154,15 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 // stand-ins in absence of wchar_t
 // ----------------------------------------------------------------------------
 
 // stand-ins in absence of wchar_t
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMBConv
+class WXDLLIMPEXP_BASE wxMBConv

 {
 public:
     const char* cMB2WX(const char *psz) const { return psz; }
     const char* cWX2MB(const char *psz) const { return psz; }
 };
 
 {
 public:
     const char* cMB2WX(const char *psz) const { return psz; }
     const char* cWX2MB(const char *psz) const { return psz; }
 };
 

-WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile;
-WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
+WXDLLIMPEXP_DATA_BASE(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal, wxConvISO8859_1, wxConvUTF8;
+WXDLLIMPEXP_DATA_BASE(extern wxMBConv *) wxConvCurrent;

 
 #define wxFNCONV(name) name
 #define wxFNSTRINGCAST WXSTRINGCAST
 
 #define wxFNCONV(name) name
 #define wxFNSTRINGCAST WXSTRINGCAST