added state image support (patch 530155)

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 8a8cc1388043491e0160475b55dac2e1b4497f4b..dd127751ddd7e30f2a7bf0dd18b54753fb9ea41d 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -36,7 +36,7 @@
 // wxMBConv (base class for conversions, using libc conversion itself)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMBConv
+class WXDLLIMPEXP_BASE wxMBConv
 {
 public:
     // the actual conversion takes place here
@@ -63,58 +63,41 @@ public:
     virtual ~wxMBConv();
 };
 
-WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
+WXDLLIMPEXP_DATA_BASE(extern wxMBConv) wxConvLibc;
 
 // ----------------------------------------------------------------------------
 // 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;
 };
 
-WXDLLEXPORT_DATA(extern wxMBConvUTF7) wxConvUTF7;
+WXDLLIMPEXP_DATA_BASE(extern wxMBConvUTF7) wxConvUTF7;
 
 // ----------------------------------------------------------------------------
 // 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;
 };
 
-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)
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCharacterSet;
+class WXDLLIMPEXP_BASE wxCharacterSet;
 
-class WXDLLEXPORT wxCSConv : public wxMBConv
+class WXDLLIMPEXP_BASE wxCSConv : public wxMBConv
 {
 public:
     wxCSConv(const wxChar *charset);
@@ -141,9 +124,9 @@ private:
 };
 
 #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
@@ -171,15 +154,15 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 // 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; }
 };
 
-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