Do not use Tooltips if they are disabled

[wxWidgets.git] / src / common / unichar.cpp

diff --git a/src/common/unichar.cpp b/src/common/unichar.cpp
index b0f3eb403097211225ce6368fe9176fe66c5f7fd..163d388744634e4fd5d9645981f7a193803ee334 100644 (file)
--- a/src/common/unichar.cpp
+++ b/src/common/unichar.cpp
@@ -21,6 +21,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/strconv.h"  // wxConvLibc
 
 #ifndef WX_PRECOMP
     #include "wx/strconv.h"  // wxConvLibc

+    #include "wx/log.h"

 #endif
 
 #include "wx/unichar.h"
 #endif
 
 #include "wx/unichar.h"


@@ -35,38 +36,40 @@
 // ---------------------------------------------------------------------------
 
 /* static */
 // ---------------------------------------------------------------------------
 
 /* static */

-wxUniChar::value_type wxUniChar::From8bit(char c)
+wxUniChar::value_type wxUniChar::FromHi8bit(char c)

 {
 {

-    // all supported charsets have the first 128 characters same as ASCII:
-    if ( (unsigned char)c < 0x80 )
-        return c;
-

 #if wxUSE_UTF8_LOCALE_ONLY
 #if wxUSE_UTF8_LOCALE_ONLY

-    wxFAIL_MSG( _T("invalid UTF-8 character") );
+    wxFAIL_MSG( "invalid UTF-8 character" );
+    wxUnusedVar(c);
+

     return wxT('?'); // FIXME-UTF8: what to use as failure character?
 #else
     wchar_t buf[2];
     if ( wxConvLibc.ToWChar(buf, 2, &c, 1) != 2 )
     return wxT('?'); // FIXME-UTF8: what to use as failure character?
 #else
     wchar_t buf[2];
     if ( wxConvLibc.ToWChar(buf, 2, &c, 1) != 2 )

+    {
+        wxFAIL_MSG( "invalid multibyte character" );

         return wxT('?'); // FIXME-UTF8: what to use as failure character?
         return wxT('?'); // FIXME-UTF8: what to use as failure character?

+    }

     return buf[0];
 #endif
 }
 
 /* static */
     return buf[0];
 #endif
 }
 
 /* static */

-char wxUniChar::To8bit(wxUniChar::value_type c)
+char wxUniChar::ToHi8bit(wxUniChar::value_type c)

 {
 {

-    // all supported charsets have the first 128 characters same as ASCII:
-    if ( c < 0x80 )
-        return c;
-

 #if wxUSE_UTF8_LOCALE_ONLY
 #if wxUSE_UTF8_LOCALE_ONLY

-    wxFAIL_MSG( _T("character cannot be converted to single UTF-8 byte") );
+    wxFAIL_MSG( "character cannot be converted to single UTF-8 byte" );
+    wxUnusedVar(c);
+

     return '?'; // FIXME-UTF8: what to use as failure character?
 #else
     wchar_t in = c;
     char buf[2];
     if ( wxConvLibc.FromWChar(buf, 2, &in, 1) != 2 )
     return '?'; // FIXME-UTF8: what to use as failure character?
 #else
     wchar_t in = c;
     char buf[2];
     if ( wxConvLibc.FromWChar(buf, 2, &in, 1) != 2 )

+    {
+        wxFAIL_MSG( "character cannot be converted to single byte" );

         return '?'; // FIXME-UTF8: what to use as failure character?
         return '?'; // FIXME-UTF8: what to use as failure character?

+    }

     return buf[0];
 #endif
 }
     return buf[0];
 #endif
 }


@@ -97,14 +100,13 @@ wxUniCharRef& wxUniCharRef::operator=(const wxUniChar& c)
         for ( size_t i = 0; i < lenNew; ++i, ++pos )
             *pos = utf[i];
     }
         for ( size_t i = 0; i < lenNew; ++i, ++pos )
             *pos = utf[i];
     }

-    else
+    else // length of character encoding in UTF-8 changed

     {
         // the worse case is when the new value has either longer or shorter
         // code -- in that case, we have to use wxStringImpl::replace() and
         // this invalidates all iterators, so we have to update them too:
 
     {
         // the worse case is when the new value has either longer or shorter
         // code -- in that case, we have to use wxStringImpl::replace() and
         // this invalidates all iterators, so we have to update them too:
 

-        wxString& str = *wx_const_cast(wxString*, m_node.m_str);
-        wxStringImpl& strimpl = str.m_impl;
+        wxStringImpl& strimpl = m_str.m_impl;

 
         int iterDiff = lenNew - lenOld;
         size_t posIdx = m_pos - strimpl.begin();
 
         int iterDiff = lenNew - lenOld;
         size_t posIdx = m_pos - strimpl.begin();


@@ -118,7 +120,7 @@ wxUniCharRef& wxUniCharRef::operator=(const wxUniChar& c)
         size_t *indexes = indexes_a;
         size_t iterNum = 0;
         wxStringIteratorNode *it;
         size_t *indexes = indexes_a;
         size_t iterNum = 0;
         wxStringIteratorNode *it;

-        for ( it = str.m_iterators.ptr; it; it = it->m_next, ++iterNum )
+        for ( it = m_str.m_iterators.ptr; it; it = it->m_next, ++iterNum )

         {
             wxASSERT( it->m_iter || it->m_citer );
 
         {
             wxASSERT( it->m_iter || it->m_citer );
 


@@ -146,10 +148,14 @@ wxUniCharRef& wxUniCharRef::operator=(const wxUniChar& c)
         // update the string:
         strimpl.replace(m_pos, m_pos + lenOld, utf, lenNew);
 
         // update the string:
         strimpl.replace(m_pos, m_pos + lenOld, utf, lenNew);
 

+#if wxUSE_STRING_POS_CACHE
+        m_str.InvalidateCache();
+#endif // wxUSE_STRING_POS_CACHE
+

         // finally, set the iterators to valid values again (note that this
         // updates m_pos as well):
         size_t i;
         // finally, set the iterators to valid values again (note that this
         // updates m_pos as well):
         size_t i;

-        for ( i = 0, it = str.m_iterators.ptr; it; it = it->m_next, ++i )
+        for ( i = 0, it = m_str.m_iterators.ptr; it; it = it->m_next, ++i )

         {
             wxASSERT( i < iterNum );
             wxASSERT( it->m_iter || it->m_citer );
         {
             wxASSERT( i < iterNum );
             wxASSERT( it->m_iter || it->m_citer );