From: Ryan Norton <wxprojects@comcast.net>
Date: Sun, 14 Dec 2003 19:36:35 +0000 (+0000)
Subject: Some unicode changes...
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fc4aca1838fb7bbc3da677c72039564bff51cbff

Some unicode changes...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index 5e31745d4c..39ef3f48e1 100644
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -60,8 +60,8 @@
 
 /* internal character type and related */
 typedef wx_wchar chr;			/* the type itself */
-typedef unsigned uchr;			/* unsigned type that will hold a chr */
-typedef int celt;				/* type to hold chr, MCCE number, or
+typedef wx_wchar uchr;			/* unsigned type that will hold a chr */
+typedef wx_wchar celt;				/* type to hold chr, MCCE number, or
 								 * NOCELT */
 
 #define NOCELT	(-1)			/* celt value which is not valid chr or
@@ -69,9 +69,9 @@ typedef int celt;				/* type to hold chr, MCCE number, or
 #define CHR(c)	((unsigned char) (c))	/* turn char literal into chr
 										 * literal */
 #define DIGITVAL(c) ((c)-'0')	/* turn chr digit into its value */
-#define CHRBITS 32				/* bits in a chr; must not use sizeof */
+#define CHRBITS 16/*32*/				/* bits in a chr; must not use sizeof */
 #define CHR_MIN 0x00000000		/* smallest and largest chr; the value */
-#define CHR_MAX 0xfffffffe		/* CHR_MAX-CHR_MIN+1 should fit in uchr */
+#define CHR_MAX 1 << CHRBITS /*0xfffffffe*/		/* CHR_MAX-CHR_MIN+1 should fit in uchr */
 
 /* functions operating on chr */
 #define iscalnum(x) wx_isalnum(x)