From 4dd1e8f845f60c949225b91552eafc44f054d994 Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Thu, 28 Jun 2001 00:34:09 +0000 Subject: [PATCH] 2001-06-27 Dave Peticolas * src/register/QuickFill.c: same as below * src/register/quickfillcell.c: use wide character conversion functions git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4829 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 5 +++++ src/register/QuickFill.c | 5 +++-- src/register/quickfillcell.c | 9 +++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c1d9468cf..64d2052ddd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2001-06-27 Dave Peticolas + * src/register/QuickFill.c: same as below + + * src/register/quickfillcell.c: use wide character conversion + functions + * AUTHORS: credits * doc/sgml/C/xacc-about.sgml: credits diff --git a/src/register/QuickFill.c b/src/register/QuickFill.c index 76243a07cc..9ba2e5d0ec 100644 --- a/src/register/QuickFill.c +++ b/src/register/QuickFill.c @@ -27,6 +27,7 @@ #include #include +#include #include "QuickFill.h" #include "basiccell.h" @@ -140,7 +141,7 @@ gnc_quickfill_string (QuickFill *qf) QuickFill * gnc_quickfill_get_char_match (QuickFill *qf, GdkWChar wc) { - guint key = islower (wc) ? toupper (wc) : wc; + guint key = iswlower (wc) ? towupper (wc) : wc; if (qf == NULL) return NULL; @@ -282,7 +283,7 @@ quickfill_insert_recursive (QuickFill *qf, const GdkWChar *text, int depth, if ((text == NULL) || (text[depth] == 0)) return; - key = islower (text[depth]) ? toupper (text[depth]) : text[depth]; + key = iswlower (text[depth]) ? towupper (text[depth]) : text[depth]; match_qf = g_hash_table_lookup (qf->matches, GUINT_TO_POINTER (key)); if (match_qf == NULL) diff --git a/src/register/quickfillcell.c b/src/register/quickfillcell.c index eb6d7c3f8e..2429ffcac1 100644 --- a/src/register/quickfillcell.c +++ b/src/register/quickfillcell.c @@ -40,6 +40,7 @@ #include #include #include +#include #include "basiccell.h" #include "quickfillcell.h" @@ -101,8 +102,8 @@ wcstrcaseequal (const GdkWChar *s1, const GdkWChar *s2) if (s1[i] == 0 || s2[i] == 0) return s1[i] == s2[i]; - a = islower (s1[i]) ? toupper (s1[i]) : s1[i]; - b = islower (s2[i]) ? toupper (s2[i]) : s2[i]; + a = iswlower (s1[i]) ? towupper (s1[i]) : s1[i]; + b = iswlower (s2[i]) ? towupper (s2[i]) : s2[i]; if (a != b) return FALSE; @@ -130,8 +131,8 @@ wcstrncaseequal (const GdkWChar *s1, const GdkWChar *s2, int len) if (s1[i] == 0 || s2[i] == 0) return FALSE; - a = islower (s1[i]) ? toupper (s1[i]) : s1[i]; - b = islower (s2[i]) ? toupper (s2[i]) : s2[i]; + a = iswlower (s1[i]) ? towupper (s1[i]) : s1[i]; + b = iswlower (s2[i]) ? towupper (s2[i]) : s2[i]; if (a != b) return FALSE;