X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47b378bd88260611387af8604a1c8f62355350ab..806ad819585655ac1c35427409611d7795d0b910:/include/wx/unichar.h

diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index 71e4426eae..f2bc4b0e48 100644
--- a/include/wx/unichar.h
+++ b/include/wx/unichar.h
@@ -176,7 +176,7 @@ public:
 #endif
 
     wxUniChar::value_type GetValue() const { return UniChar().GetValue(); }
-    bool IsAscii() const { return UniChar().GetValue(); }
+    bool IsAscii() const { return UniChar().IsAscii(); }
 
     // Assignment operators:
 #if wxUSE_UNICODE_UTF8
@@ -237,19 +237,10 @@ public:
 #endif
 
 private:
-    wxUniChar UniChar() const
-    {
 #if wxUSE_UNICODE_UTF8
-        return DecodeChar(m_pos);
+    wxUniChar UniChar() const;
 #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;