SWIGged updates for wxMac

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 3ff2d7a8dbbbc73be57f18338c175db576f018f7..9ed3790af0b00e53cae7aa11be224e6e07b956e2 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -20,163 +20,185 @@
 #include "wx/wxchar.h"
 #include "wx/buffer.h"
 
 #include "wx/wxchar.h"
 #include "wx/buffer.h"
 

+#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
 {
 public:
 
 class WXDLLEXPORT wxMBConv
 {
 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;
+
+    // No longer inline since BC++ complains.
+    const wxWCharBuffer cMB2WC(const char *psz) const;
+    const wxCharBuffer cWC2MB(const wchar_t *psz) 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
 #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
+    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

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

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

 // wxMBConvFile (for conversion to filenames)
 // wxMBConvFile (for conversion to filenames)

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

 
 

-class WXDLLEXPORT wxMBConvFile: public wxMBConv 
+class WXDLLEXPORT wxMBConvFile : 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 wxMBConvFile) wxConvFile;
 
 };
 
 WXDLLEXPORT_DATA(extern wxMBConvFile) wxConvFile;
 

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

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

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

 
 

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

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

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

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

 
 

-class WXDLLEXPORT wxMBConvUTF8: public wxMBConv 
+class WXDLLEXPORT 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;
 
 #ifdef __WXGTK12__
 };
 
 WXDLLEXPORT_DATA(extern wxMBConvUTF8) wxConvUTF8;
 
 #ifdef __WXGTK12__

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

 // wxMBConvUTF8 (for conversion using GDK's internal converions)
 // wxMBConvUTF8 (for conversion using GDK's internal converions)

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

 
 

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

-#endif

 
 

-//---------------------------------------------------------------------------
-// wxCSConv (for conversion based on laodable char sets)
-//---------------------------------------------------------------------------
+#endif // wxGTK 1.2
+
+// ----------------------------------------------------------------------------
+// wxCSConv (for conversion based on loadable char sets)
+// ----------------------------------------------------------------------------

 
 

-class wxCharacterSet;
+class WXDLLEXPORT wxCharacterSet;

 
 

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

 {
 {

-private:
-  wxChar *m_name;
-  wxCharacterSet *m_cset;
-  bool m_deferred;
-  void SetName(const wxChar *charset);
-  

 public:
 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;
+    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;
+
+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;

 };
 
 WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;
 };
 
 WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;

-#define wxConv_local wxConvLocal
-

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

-#define wxConv_current wxConvCurrent

 
 

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

 // filename conversion macros
 // filename conversion macros

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

 
 // filenames are multibyte on Unix and probably widechar on Windows?
 #if defined(__UNIX__) || defined(__BORLANDC__)
 
 // filenames are multibyte on Unix and probably widechar on Windows?
 #if defined(__UNIX__) || defined(__BORLANDC__)

-#define wxMBFILES 1
+    #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 WXDLLEXPORT 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;
 
 #define wxFNCONV(name) name
 WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile;
 WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 
 #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__