don't assert when creating an initially empty wxCB_READONLY combobox

[wxWidgets.git] / src / regex / regcustom.h

diff --git a/src/regex/regcustom.h b/src/regex/regcustom.h
index d13dcef80746b034263b67f3ef3e36d4d0b1d68d..8f51782d53203ada45c1f83b38634a1cce6dfb0b 100644 (file)
--- a/src/regex/regcustom.h
+++ b/src/regex/regcustom.h
@@ -1,3 +1,6 @@
+#ifndef _REGEX_CUSTOM_H_
+#define _REGEX_CUSTOM_H_
+

 /*
  * Copyright (c) 1998, 1999 Henry Spencer.     All rights reserved.
  *
 /*
  * Copyright (c) 1998, 1999 Henry Spencer.     All rights reserved.
  *


@@ -30,35 +33,28 @@
 
 /* headers if any */
 
 
 /* headers if any */
 

-// FreeBSD, Watcom and DMars require this, CW doesn't have nor need it.
-// Others also don't seem to need it. If you have an error related to
-// (not) including <sys/types.h> please report details to
-// wx-dev@lists.wxwindows.org
+/*  FreeBSD, Watcom and DMars require this, CW doesn't have nor need it. */
+/*  Others also don't seem to need it. If you have an error related to */
+/*  (not) including <sys/types.h> please report details to */
+/*  wx-dev@lists.wxwindows.org */

 #if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
 #   include <sys/types.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
 #   include <sys/types.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>

+#include <string.h>

 #include <ctype.h>
 #include <limits.h>
 #include <ctype.h>
 #include <limits.h>

-#ifndef wxCHECK_GCC_VERSION
-#define wxCHECK_GCC_VERSION( major, minor ) \
-    ( defined(__GNUC__) && defined(__GNUC_MINOR__) \
-    && ( ( __GNUC__ > (major) ) \
-        || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) ) )
-#endif

 
 

-#if !wxUSE_UNICODE
-#      define wx_wchar char
-#else // Unicode
-    #if (defined(__GNUC__) && !wxCHECK_GCC_VERSION(2, 96))
-    #          define wx_wchar __WCHAR_TYPE__ 
-    #else // __WCHAR_TYPE__ and gcc < 2.96
-        // standard case
-        #              define wx_wchar wchar_t         
-    #endif // __WCHAR_TYPE__
-#endif // ASCII/Unicode
+#include "wx/wxchar.h"
+
+/**
+*
+*   wx_wchar == wxChar
+*   
+*/
+#define wx_wchar wxChar

 
 /* overrides for regguts.h definitions, if any */
 #define FUNCPTR(name, args) (*name) args
 
 /* overrides for regguts.h definitions, if any */
 #define FUNCPTR(name, args) (*name) args


@@ -78,19 +74,15 @@ typedef long celt;                          /* type to hold chr, MCCE number, or
                                                                                 * literal */
 #define DIGITVAL(c) ((c)-'0')  /* turn chr digit into its value */
 
                                                                                 * literal */
 #define DIGITVAL(c) ((c)-'0')  /* turn chr digit into its value */
 

-/*  RN - the "not use sizeof() thing is really annoying!" */
-#if wxUSE_UNICODE
-#      define CHRBITS 32
-#else
-#      define CHRBITS 8                        /* bits in a chr; must not use sizeof */
-#endif
-#define CHR_MIN 0x00000000             /* smallest and largest chr; the value */
-/*     
-       PUTTING PARENTHASES AROUND THIS, I.E. (1 << CHRBITS) WILL
-       CAUSE ALL CHARACTERS TO BE MATCHED!!!
-*/
-#define CHR_MAX 1 << CHRBITS /*0xfffffffe*/            /* CHR_MAX-CHR_MIN+1 should fit in uchr */
-
+#if wxUSE_WCHAR_T
+#   define CHRBITS (SIZEOF_WCHAR_T << 3)                       /* bits in a chr; must not use sizeof */
+#   define CHR_MAX ((1 << CHRBITS) - 1)
+#   define CHR_MIN 0x00000000          /* smallest and largest chr; the value */
+#else /*ANSI*/
+#   define CHRBITS 8
+#   define CHR_MAX 0xFF
+#   define CHR_MIN 0x00
+#endif /*wxUSE_WCHAR_T*/

 
 /* functions operating on chr */
 #define iscalnum(x) wx_isalnum(x)
 
 /* functions operating on chr */
 #define iscalnum(x) wx_isalnum(x)


@@ -98,5 +90,9 @@ typedef long celt;                            /* type to hold chr, MCCE number, or
 #define iscdigit(x) wx_isdigit(x)
 #define iscspace(x) wx_isspace(x)
 
 #define iscdigit(x) wx_isdigit(x)
 #define iscspace(x) wx_isspace(x)
 

+extern int  wx_strlen(const wx_wchar* szString);
+

 /* and pick up the standard header */
 #include "regex.h"
 /* and pick up the standard header */
 #include "regex.h"

+
+#endif /* _REGEX_CUSTOM_H_ */