Derive wxScrollBar from wxScrollBarBase, plus miscellaneous

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index ba1e84d5791a126d156f99f61f5c70d160c36f52..8a8cc1388043491e0160475b55dac2e1b4497f4b 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,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


@@ -54,6 +58,9 @@ public:
     const wxCharBuffer cWC2WX(const wchar_t *psz) const { return cWC2MB(psz); }
     const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); }
 #endif // Unicode/ANSI
     const wxCharBuffer cWC2WX(const wchar_t *psz) const { return cWC2MB(psz); }
     const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); }
 #endif // Unicode/ANSI

+
+    // virtual dtor for any base class
+    virtual ~wxMBConv();

 };
 
 WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
 };
 
 WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;


@@ -115,7 +122,7 @@ public:
     virtual ~wxCSConv();
 
     wxCSConv& operator=(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;
     void LoadNow();
 
     virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;


@@ -135,6 +142,7 @@ private:
 
 #define wxConvFile wxConvLocal
 WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;
 
 #define wxConvFile wxConvLocal
 WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;

+WXDLLEXPORT_DATA(extern wxCSConv) wxConvISO8859_1;

 WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 
 // ----------------------------------------------------------------------------
 WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 
 // ----------------------------------------------------------------------------


@@ -142,7 +150,7 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 // ----------------------------------------------------------------------------
 
 // filenames are multibyte on Unix and probably widechar on Windows?
 // ----------------------------------------------------------------------------
 
 // 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


@@ -170,7 +178,7 @@ public:
     const char* cWX2MB(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) wxConvLibc, wxConvFile, wxConvLocal, wxConvISO8859_1, wxConvUTF8;

 WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 
 #define wxFNCONV(name) name
 WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 
 #define wxFNCONV(name) name