Added header needed for Solaris to find finite() prototype.

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

diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index 6ce07892156f3072b1f00cd7f10f1933340448ec..defc237114679e57013165dc85fb0278dda39f45 100644 (file)
--- a/include/wx/unichar.h
+++ b/include/wx/unichar.h
@@ -96,7 +96,7 @@ public:
     bool operator&&(bool v) const { return (bool)*this && v; }
 
     // Assignment operators:
     bool operator&&(bool v) const { return (bool)*this && v; }
 
     // Assignment operators:

-    wxUniChar& operator=(const wxUniChar& c) { m_value = c.m_value; return *this; }
+    wxUniChar& operator=(const wxUniChar& c) { if (&c != this) m_value = c.m_value; return *this; }

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


@@ -141,18 +141,26 @@ private:
     // characters purely for performance reasons
     static value_type From8bit(char c)
     {
     // characters purely for performance reasons
     static value_type From8bit(char c)
     {

+#if wxUSE_UNICODE

         if ( (unsigned char)c < 0x80 )
             return c;
 
         return FromHi8bit(c);
         if ( (unsigned char)c < 0x80 )
             return c;
 
         return FromHi8bit(c);

+#else
+        return c;
+#endif

     }
 
     static char To8bit(value_type c)
     {
     }
 
     static char To8bit(value_type c)
     {

+#if wxUSE_UNICODE

         if ( c < 0x80 )
             return c;
 
         return ToHi8bit(c);
         if ( c < 0x80 )
             return c;
 
         return ToHi8bit(c);

+#else
+        return c;
+#endif

     }
 
     // helpers of the functions above called to deal with non-ASCII chars
     }
 
     // helpers of the functions above called to deal with non-ASCII chars


@@ -210,7 +218,7 @@ public:
 #endif
 
     wxUniCharRef& operator=(const wxUniCharRef& c)
 #endif
 
     wxUniCharRef& operator=(const wxUniCharRef& c)

-        { return *this = c.UniChar(); }
+        { if (&c != this) *this = c.UniChar(); return *this; }

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