Added some standard further identifiers to help with WinCE toolbars

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 3ff2d7a8dbbbc73be57f18338c175db576f018f7..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,163 +20,169 @@
 #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
 

-//---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // 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:
 {
 public:

+    // the actual conversion takes place here
+    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;

 
 

-  // the actual conversion takes place here
-  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;
-  
-  // No longer inline since BC++ complains.
-  const wxWCharBuffer cMB2WC(const char *psz) const;
-  const wxCharBuffer cWC2MB(const wchar_t *psz) const;
-#if wxUSE_UNICODE
-  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; }
-#else
-  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
-};
-
-WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
+    // No longer inline since BC++ complains.
+    const wxWCharBuffer cMB2WC(const char *psz) const;
+    const wxCharBuffer cWC2MB(const wchar_t *psz) const;

 
 

-//---------------------------------------------------------------------------
-// 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;
+#if wxUSE_UNICODE
+    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* 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
+
+    // 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:
 {
 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 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:
 {
 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 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;
+
+// ----------------------------------------------------------------------------
+// wxCSConv (for conversion based on loadable char sets)
+// ----------------------------------------------------------------------------

 
 

-#ifdef __WXGTK12__
-//---------------------------------------------------------------------------
-// wxMBConvUTF8 (for conversion using GDK's internal converions)
-//---------------------------------------------------------------------------
+class WXDLLIMPEXP_BASE wxCharacterSet;

 
 

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

 {
 public:
 {
 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;
-};
+    wxCSConv(const wxChar *charset);
+    wxCSConv(const wxCSConv& conv);
+    virtual ~wxCSConv();

 
 

-WXDLLEXPORT_DATA(extern wxMBConvGdk) wxConvGdk;
-#endif
+    wxCSConv& operator=(const wxCSConv& conv);

 
 

-//---------------------------------------------------------------------------
-// wxCSConv (for conversion based on laodable char sets)
-//---------------------------------------------------------------------------
+    void LoadNow();

 
 

-class wxCharacterSet;
+    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() ;

 
 

-class WXDLLEXPORT wxCSConv: public wxMBConv
-{

 private:
 private:

-  wxChar *m_name;
-  wxCharacterSet *m_cset;
-  bool m_deferred;
-  void SetName(const wxChar *charset);
-  
-public:
-  wxCSConv(const wxChar *charset);
-  virtual ~wxCSConv();
-  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 SetName(const wxChar *charset);

 
 

-WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;
-#define wxConv_local wxConvLocal
+    // 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;
+};

 
 

-WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
-#define wxConv_current 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
 // filename conversion macros

-//---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 // 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__)
-#define wxMBFILES 1
+#if defined(__UNIX__) || defined(__BORLANDC__) || defined(__WXMAC__ )
+    #define wxMBFILES 1

 #else
 #else

-#define wxMBFILES 0
+    #define wxMBFILES 0

 #endif
 
 #endif
 

-#if wxMBFILES
-#define wxFNCONV(name) wxConvFile.cWX2MB(name)
-#define FNSTRINGCAST MBSTRINGCAST
+#if wxMBFILES && wxUSE_UNICODE
+    #define wxFNCONV(name) wxConvFile.cWX2MB(name)
+    #define wxFNSTRINGCAST wxMBSTRINGCAST

 #else
 #else

-#define wxFNCONV(name) name
-#define FNSTRINGCAST WXSTRINGCAST
+    #define wxFNCONV(name) name
+    #define wxFNSTRINGCAST WXSTRINGCAST

 #endif
 
 #else
   // !wxUSE_WCHAR_T
 
 #endif
 
 #else
   // !wxUSE_WCHAR_T
 

-//---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // stand-ins in absence of wchar_t
 // stand-ins in absence of wchar_t

-//---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxMBConv 
+class WXDLLIMPEXP_BASE wxMBConv

 {
 public:
 {
 public:

-  const char* cMB2WX(const char *psz) const { return psz; }
-  const char* cWX2MB(const char *psz) const { return psz; }
+    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 wxFNCONV(name) name

-#define FNSTRINGCAST WXSTRINGCAST
+#define wxFNSTRINGCAST WXSTRINGCAST

 
 #endif
   // wxUSE_WCHAR_T
 
 
 #endif
   // wxUSE_WCHAR_T
 

-#endif  
+// ----------------------------------------------------------------------------
+// macros for the most common conversions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_UNICODE
+    #define wxConvertWX2MB(s)   wxConvCurrent->cWX2MB(s)
+    #define wxConvertMB2WX(s)   wxConvCurrent->cMB2WX(s)
+#else // ANSI
+    // no conversions to do
+    #define wxConvertWX2MB(s)   (s)
+    #define wxConvertMB2WX(s)   (s)
+#endif // Unicode/ANSI
+
+#endif

   // _WX_WXSTRCONVH__
 
   // _WX_WXSTRCONVH__