Provide NSAutoreleasePool instances during initialization

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 50802dc6f9cf6540580a8cb2e10e0a2fafe76b3d..384a4b3769c6d763f7b6e64c0618a24adb1985cb 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -20,6 +20,10 @@
 #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
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 #  undef __BSEXCPT__
 #endif


@@ -32,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


@@ -59,33 +63,33 @@ public:
     virtual ~wxMBConv();
 };
 
     virtual ~wxMBConv();
 };
 

-WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
+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;
+WXDLLIMPEXP_DATA_BASE(extern wxMBConvUTF8) wxConvUTF8;

 
 #ifdef __WXGTK12__
 
 
 #ifdef __WXGTK12__
 


@@ -93,14 +97,14 @@ WXDLLEXPORT_DATA(extern wxMBConvUTF8) wxConvUTF8;
 // wxMBConvUTF8 (for conversion using GDK's internal converions)
 // ----------------------------------------------------------------------------
 
 // wxMBConvUTF8 (for conversion using GDK's internal converions)
 // ----------------------------------------------------------------------------
 

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

 
 #endif // wxGTK 1.2
 
 
 #endif // wxGTK 1.2
 


@@ -108,9 +112,9 @@ WXDLLEXPORT_DATA(extern wxMBConvGdk) wxConvGdk;
 // 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);


@@ -137,9 +141,9 @@ private:
 };
 
 #define wxConvFile wxConvLocal
 };
 
 #define wxConvFile wxConvLocal

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

 
 // ----------------------------------------------------------------------------
 // filename conversion macros
 
 // ----------------------------------------------------------------------------
 // filename conversion macros


@@ -167,15 +171,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, wxConvLocal, wxConvISO8859_1, wxConvUTF8;
-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