show the unhandled exceptions in debug build instead of silently eating them

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

diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index 95626697109934d715ed7205a421619fe78d2354..ed7c494d37e717d3600f3a5ed4a8d460d22fdb28 100644 (file)
--- a/include/wx/unichar.h
+++ b/include/wx/unichar.h
@@ -18,7 +18,8 @@
 // wint_t is just a typedef for wchar_t for many old compilers but for modern
 // ones it's a separate type and we must provide a conversion to it to allow
 // passing wxUniChar[Ref] to functions taking wint_t such as iswalnum() &c
 // wint_t is just a typedef for wchar_t for many old compilers but for modern
 // ones it's a separate type and we must provide a conversion to it to allow
 // passing wxUniChar[Ref] to functions taking wint_t such as iswalnum() &c

-#if (defined(__GNUC__) && !defined(__DARWIN__) && !defined(__OS2__)) || \
+#if (defined(__GNUC__) && \
+        !defined(__DARWIN__) && !defined(__OS2__) && !defined(__DOS__)) || \

     (defined(__VISUALC__) && defined(_NATIVE_WCHAR_T_DEFINED))
     #define wxWINT_T_IS_SEPARATE_TYPE
 #endif
     (defined(__VISUALC__) && defined(_NATIVE_WCHAR_T_DEFINED))
     #define wxWINT_T_IS_SEPARATE_TYPE
 #endif


@@ -38,6 +39,7 @@
 #endif
 
 class WXDLLIMPEXP_BASE wxUniCharRef;
 #endif
 
 class WXDLLIMPEXP_BASE wxUniCharRef;

+class WXDLLIMPEXP_BASE wxStringIteratorNode;

 
 // This class represents single Unicode character. It can be converted to
 // and from char or wchar_t and implements commonly used character operations.
 
 // This class represents single Unicode character. It can be converted to
 // and from char or wchar_t and implements commonly used character operations.


@@ -63,12 +65,26 @@ public:
 #endif
 
     wxUniChar(int c) { m_value = c; }
 #endif
 
     wxUniChar(int c) { m_value = c; }

+    wxUniChar(long int c) { m_value = c; }

 
     wxUniChar(const wxUniCharRef& c);
 
     // Returns Unicode code point value of the character
     value_type GetValue() const { return m_value; }
 
 
     wxUniChar(const wxUniCharRef& c);
 
     // Returns Unicode code point value of the character
     value_type GetValue() const { return m_value; }
 

+#if wxUSE_UNICODE_UTF8
+    // buffer for single UTF-8 character
+    struct Utf8CharBuffer
+    {
+        char data[5];
+        operator const char*() const { return data; }
+    };
+
+    // returns the character encoded as UTF-8
+    // (NB: implemented in stringops.cpp)
+    Utf8CharBuffer AsUTF8() const;
+#endif // wxUSE_UNICODE_UTF8
+

     // Returns true if the character is an ASCII character:
     bool IsAscii() const { return m_value < 0x80; }
 
     // Returns true if the character is an ASCII character:
     bool IsAscii() const { return m_value < 0x80; }
 


@@ -78,6 +94,7 @@ public:
     operator char() const { return To8bit(m_value); }
     operator wchar_t() const { return m_value; }
     operator int() const { return m_value; }
     operator char() const { return To8bit(m_value); }
     operator wchar_t() const { return m_value; }
     operator int() const { return m_value; }

+    operator long int() const { return m_value; }

 #ifndef wxWCHAR_T_IS_UINT
     operator unsigned int() const { return m_value; }
 #endif
 #ifndef wxWCHAR_T_IS_UINT
     operator unsigned int() const { return m_value; }
 #endif


@@ -109,8 +126,10 @@ public:
     // Assignment operators:
     wxUniChar& operator=(const wxUniChar& c) { m_value = c.m_value; return *this; }
     wxUniChar& operator=(char c) { m_value = From8bit(c); return *this; }
     // Assignment operators:
     wxUniChar& operator=(const wxUniChar& c) { m_value = c.m_value; return *this; }
     wxUniChar& operator=(char c) { m_value = From8bit(c); return *this; }

+    wxUniChar& operator=(unsigned char c) { m_value = From8bit((char)c); return *this; }

     wxUniChar& operator=(wchar_t c) { m_value = c; return *this; }
     wxUniChar& operator=(int c) { m_value = c; return *this; }
     wxUniChar& operator=(wchar_t c) { m_value = c; return *this; }
     wxUniChar& operator=(int c) { m_value = c; return *this; }

+    wxUniChar& operator=(long int c) { m_value = c; return *this; }

 #ifdef wxWINT_T_IS_SEPARATE_TYPE
     wxUniChar& operator=(wint_t c) { m_value = c; return *this; }
 #endif
 #ifdef wxWINT_T_IS_SEPARATE_TYPE
     wxUniChar& operator=(wint_t c) { m_value = c; return *this; }
 #endif


@@ -121,7 +140,10 @@ public:
 #define wxDEFINE_UNICHAR_OPERATOR(op)                                         \
     bool operator op(const wxUniChar& c) const { return m_value op c.m_value; }\
     bool operator op(char c) const { return m_value op From8bit(c); }         \
 #define wxDEFINE_UNICHAR_OPERATOR(op)                                         \
     bool operator op(const wxUniChar& c) const { return m_value op c.m_value; }\
     bool operator op(char c) const { return m_value op From8bit(c); }         \

+    bool operator op(unsigned char c) const { return m_value op From8bit((char)c); } \

     bool operator op(wchar_t c) const { return m_value op (value_type)c; }    \
     bool operator op(wchar_t c) const { return m_value op (value_type)c; }    \

+    bool operator op(int c) const { return m_value op (value_type)c; }        \
+    bool operator op(long int c) const { return m_value op (value_type)c; }   \

     wxIF_WINT_T_TYPE( bool operator op(wint_t c) const { return m_value op (value_type)c; } )
 
     wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHAR_OPERATOR)
     wxIF_WINT_T_TYPE( bool operator op(wint_t c) const { return m_value op (value_type)c; } )
 
     wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHAR_OPERATOR)


@@ -131,6 +153,7 @@ public:
     // this is needed for expressions like 'Z'-c
     int operator-(const wxUniChar& c) const { return m_value - c.m_value; }
     int operator-(char c) const { return m_value - From8bit(c); }
     // this is needed for expressions like 'Z'-c
     int operator-(const wxUniChar& c) const { return m_value - c.m_value; }
     int operator-(char c) const { return m_value - From8bit(c); }

+    int operator-(unsigned char c) const { return m_value - From8bit((char)c); }

     int operator-(wchar_t c) const { return m_value - (value_type)c; }
 #ifdef wxWINT_T_IS_SEPARATE_TYPE
     int operator-(wint_t c) const { return m_value - (value_type)c; }
     int operator-(wchar_t c) const { return m_value - (value_type)c; }
 #ifdef wxWINT_T_IS_SEPARATE_TYPE
     int operator-(wint_t c) const { return m_value - (value_type)c; }


@@ -156,7 +179,7 @@ private:
 
     // create the reference
 #if wxUSE_UNICODE_UTF8
 
     // create the reference
 #if wxUSE_UNICODE_UTF8

-    wxUniCharRef(wxStringImpl& str, iterator pos) : m_str(str), m_pos(pos) {}
+    wxUniCharRef(wxStringIteratorNode& node, iterator pos) : m_node(node), m_pos(pos) {}

 #else
     wxUniCharRef(iterator pos) : m_pos(pos) {}
 #endif
 #else
     wxUniCharRef(iterator pos) : m_pos(pos) {}
 #endif


@@ -168,14 +191,19 @@ public:
     //     that must be used explicitly (this is more than using 'explicit'
     //     keyword on ctor!):
 #if wxUSE_UNICODE_UTF8
     //     that must be used explicitly (this is more than using 'explicit'
     //     keyword on ctor!):
 #if wxUSE_UNICODE_UTF8

-    static wxUniCharRef CreateForString(wxStringImpl& str, iterator pos)
-        { return wxUniCharRef(str, pos); }
+    static wxUniCharRef CreateForString(wxStringIteratorNode& node, iterator pos)
+        { return wxUniCharRef(node, pos); }

 #else
     static wxUniCharRef CreateForString(iterator pos)
         { return wxUniCharRef(pos); }
 #endif
 
     wxUniChar::value_type GetValue() const { return UniChar().GetValue(); }
 #else
     static wxUniCharRef CreateForString(iterator pos)
         { return wxUniCharRef(pos); }
 #endif
 
     wxUniChar::value_type GetValue() const { return UniChar().GetValue(); }

+
+#if wxUSE_UNICODE_UTF8
+    wxUniChar::Utf8CharBuffer AsUTF8() const { return UniChar().AsUTF8(); }
+#endif // wxUSE_UNICODE_UTF8
+

     bool IsAscii() const { return UniChar().IsAscii(); }
 
     // Assignment operators:
     bool IsAscii() const { return UniChar().IsAscii(); }
 
     // Assignment operators:


@@ -189,8 +217,10 @@ public:
         { return *this = c.UniChar(); }
 
     wxUniCharRef& operator=(char c) { return *this = wxUniChar(c); }
         { return *this = c.UniChar(); }
 
     wxUniCharRef& operator=(char c) { return *this = wxUniChar(c); }

+    wxUniCharRef& operator=(unsigned char c) { return *this = wxUniChar(c); }

     wxUniCharRef& operator=(wchar_t c) { return *this = wxUniChar(c); }
     wxUniCharRef& operator=(int c) { return *this = wxUniChar(c); }
     wxUniCharRef& operator=(wchar_t c) { return *this = wxUniChar(c); }
     wxUniCharRef& operator=(int c) { return *this = wxUniChar(c); }

+    wxUniCharRef& operator=(long int c) { return *this = wxUniChar(c); }

 #ifdef wxWINT_T_IS_SEPARATE_TYPE
     wxUniCharRef& operator=(wint_t c) { return *this = wxUniChar(c); }
 #endif
 #ifdef wxWINT_T_IS_SEPARATE_TYPE
     wxUniCharRef& operator=(wint_t c) { return *this = wxUniChar(c); }
 #endif


@@ -198,6 +228,7 @@ public:
     // Conversions to the same types as wxUniChar is convertible too:
     operator char() const { return UniChar(); }
     operator int() const { return UniChar(); }
     // Conversions to the same types as wxUniChar is convertible too:
     operator char() const { return UniChar(); }
     operator int() const { return UniChar(); }

+    operator long int() const { return UniChar(); }

     operator unsigned char() const { return UniChar(); }
     operator wchar_t() const { return UniChar(); }
 #ifdef wxWINT_T_IS_SEPARATE_TYPE
     operator unsigned char() const { return UniChar(); }
     operator wchar_t() const { return UniChar(); }
 #ifdef wxWINT_T_IS_SEPARATE_TYPE


@@ -220,7 +251,10 @@ public:
     bool operator op(const wxUniCharRef& c) const { return UniChar() op c.UniChar(); }\
     bool operator op(const wxUniChar& c) const { return UniChar() op c; }     \
     bool operator op(char c) const { return UniChar() op c; }                 \
     bool operator op(const wxUniCharRef& c) const { return UniChar() op c.UniChar(); }\
     bool operator op(const wxUniChar& c) const { return UniChar() op c; }     \
     bool operator op(char c) const { return UniChar() op c; }                 \

+    bool operator op(unsigned char c) const { return UniChar() op c; }        \

     bool operator op(wchar_t c) const { return UniChar() op c; }              \
     bool operator op(wchar_t c) const { return UniChar() op c; }              \

+    bool operator op(int c) const { return UniChar() op c; }                  \
+    bool operator op(long int c) const { return UniChar() op c; }             \

     wxIF_WINT_T_TYPE( bool operator op(wint_t c) const { return UniChar() op c; } )
 
     wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHARREF_OPERATOR)
     wxIF_WINT_T_TYPE( bool operator op(wint_t c) const { return UniChar() op c; } )
 
     wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHARREF_OPERATOR)


@@ -231,25 +265,17 @@ public:
     int operator-(const wxUniCharRef& c) const { return UniChar() - c.UniChar(); }
     int operator-(const wxUniChar& c) const { return UniChar() - c; }
     int operator-(char c) const { return UniChar() - c; }
     int operator-(const wxUniCharRef& c) const { return UniChar() - c.UniChar(); }
     int operator-(const wxUniChar& c) const { return UniChar() - c; }
     int operator-(char c) const { return UniChar() - c; }

+    int operator-(unsigned char c) const { return UniChar() - c; }

     int operator-(wchar_t c) const { return UniChar() - c; }
 #ifdef wxWINT_T_IS_SEPARATE_TYPE
     int operator-(wint_t c) const { return UniChar() - c; }
 #endif
 
 private:
     int operator-(wchar_t c) const { return UniChar() - c; }
 #ifdef wxWINT_T_IS_SEPARATE_TYPE
     int operator-(wint_t c) const { return UniChar() - c; }
 #endif
 
 private:

-    wxUniChar UniChar() const
-    {

 #if wxUSE_UNICODE_UTF8
 #if wxUSE_UNICODE_UTF8

-        return DecodeChar(m_pos);
+    wxUniChar UniChar() const;

 #else
 #else

-        return *m_pos;
-#endif
-    }
-
-#if wxUSE_UNICODE_UTF8
-    // FIXME-UTF8: move this to a separate 'string operations' class
-    static wxUniChar DecodeChar(wxStringImpl::const_iterator i);
-    friend class WXDLLIMPEXP_BASE wxString;
+    wxUniChar UniChar() const { return *m_pos; }

 #endif
 
     friend class WXDLLIMPEXP_BASE wxUniChar;
 #endif
 
     friend class WXDLLIMPEXP_BASE wxUniChar;


@@ -257,7 +283,7 @@ private:
 private:
     // reference to the string and pointer to the character in string
 #if wxUSE_UNICODE_UTF8
 private:
     // reference to the string and pointer to the character in string
 #if wxUSE_UNICODE_UTF8

-    wxStringImpl& m_str;
+    wxStringIteratorNode& m_node;

 #endif
     iterator m_pos;
 };
 #endif
     iterator m_pos;
 };


@@ -279,7 +305,7 @@ wxDEFINE_COMPARISONS(wchar_t, const wxUniChar&, wxCMP_REVERSE)
 wxDEFINE_COMPARISONS(wchar_t, const wxUniCharRef&, wxCMP_REVERSE)
 
 #ifdef wxWINT_T_IS_SEPARATE_TYPE
 wxDEFINE_COMPARISONS(wchar_t, const wxUniCharRef&, wxCMP_REVERSE)
 
 #ifdef wxWINT_T_IS_SEPARATE_TYPE

-//wxDEFINE_COMPARISONS(wint_t, const wxUniChar&, wxCMP_REVERSE)
+wxDEFINE_COMPARISONS(wint_t, const wxUniChar&, wxCMP_REVERSE)

 wxDEFINE_COMPARISONS(wint_t, const wxUniCharRef&, wxCMP_REVERSE)
 #endif
 
 wxDEFINE_COMPARISONS(wint_t, const wxUniCharRef&, wxCMP_REVERSE)
 #endif