Added wxDEPRECATED() around old wxDC methods taking

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

diff --git a/include/wx/unichar.h b/include/wx/unichar.h
index fc664c031f01eaafe53883598d1db6c375b707f9..f2bc4b0e48708ea387580d3ee5d321fd6fcd6a5d 100644 (file)
--- 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;
@@ -279,7 +270,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(wint_t, const wxUniChar&, wxCMP_REVERSE)
+//wxDEFINE_COMPARISONS(wint_t, const wxUniChar&, wxCMP_REVERSE)
 wxDEFINE_COMPARISONS(wint_t, const wxUniCharRef&, wxCMP_REVERSE)
 #endif