Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.

Browse Source 
Added Release With Debug Info to regex.dsp

2.
Added Release Unicode With Debug Info to regex.dsp and wxWindows.dsp

3.
Converted DS's C++ comments in regcustom.h and regex.h to C

4.
Converted defs.h and all headers it includes to C from C++ by
changing all C++ comments to C and using #ifdef __cplusplus to keep out C++-specific stuff.

5.
Changed wx_wchar to #define wx_wchar wxChar instead of copying wxchar.h code in regcustom.h.

6.
Changed the macros around a bit in regcustom.h.  Originally duplicated code from wx/defs.h.  Now uses SIZEOF_WCHAR_T to get the approriate data.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2003-12-17 19:30:31 +00:00
parent a2b9e95202
commit 34cbe514cf
10 changed files with 1066 additions and 988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/debug.h
View File

@@ -68,7 +68,7 @@
// Macros which are completely disabled in 'release' mode // Macros which are completely disabled in 'release' mode
// //
// NB: these functions are implemented in src/common/appcmn.cpp // NB: these functions are implemented in src/common/appcmn.cpp
#ifdef __WXDEBUG__ #if defined(__cplusplus) && defined(__WXDEBUG__)
/* /*
this function may be redefined to do something non trivial and is called this function may be redefined to do something non trivial and is called
whenever one of debugging macros fails (i.e. condition is false in an whenever one of debugging macros fails (i.e. condition is false in an
@@ -122,9 +122,12 @@
#define wxASSERT_MSG(x, m) #define wxASSERT_MSG(x, m)
#endif //__WXDEBUG__ #endif //__WXDEBUG__
// Use of wxFalse instead of FALSE suppresses compiler warnings about testing #ifdef __cplusplus
// constant expression // Use of wxFalse instead of FALSE suppresses compiler warnings about testing
WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse; // constant expression
WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
#endif
#define wxAssertFailure wxFalse #define wxAssertFailure wxFalse
// special form of assert: always triggers it (in debug mode) // special form of assert: always triggers it (in debug mode)
@@ -223,11 +226,13 @@ WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
// //
// currently this only really works under Mac in CodeWarrior builds, it always // currently this only really works under Mac in CodeWarrior builds, it always
// returns false otherwise // returns false otherwise
#ifdef __WXMAC__ #ifdef __cplusplus
#ifdef __WXMAC__
extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning(); extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning();
#else // !Mac #else // !Mac
inline bool wxIsDebuggerRunning() { return false; } inline bool wxIsDebuggerRunning() { return false; }
#endif // Mac/!Mac #endif // Mac/!Mac
#endif //__cplusplus
#endif // _WX_DEBUG_H_ #endif // _WX_DEBUG_H_

1228
include/wx/defs.h
View File

File diff suppressed because it is too large Load Diff

40
include/wx/features.h
View File

@@ -1,33 +1,35 @@
///////////////////////////////////////////////////////////////////////////// /* /////////////////////////////////////////////////////////////////////////// */
// Name: wx/features.h /* Name: wx/features.h */
// Purpose: test macros for the features which might be available in some /* Purpose: test macros for the features which might be available in some */
// wxWindows ports but not others /* wxWindows ports but not others */
// Author: Vadim Zeitlin /* Author: Vadim Zeitlin */
// Modified by: /* Modified by: */
// Created: 18.03.02 /* Created: 18.03.02 */
// RCS-ID: $Id$ /* RCS-ID: $Id$ */
// Copyright: (c) 2002 Vadim Zeitlin <vadim@wxwindows.org> /* Copyright: (c) 2002 Vadim Zeitlin <vadim@wxwindows.org> */
// Licence: wxWindows licence /* Licence: wxWindows licence */
///////////////////////////////////////////////////////////////////////////// /* /////////////////////////////////////////////////////////////////////////// */
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
#ifndef _WX_FEATURES_H_ #ifndef _WX_FEATURES_H_
#define _WX_FEATURES_H_ #define _WX_FEATURES_H_
// radio menu items are currently only implemented in wxGTK and wxMSW /* radio menu items are currently only implemented in wxGTK and wxMSW */
#if defined(__WXGTK__) || defined(__WXMSW__) #if defined(__WXGTK__) || defined(__WXMSW__)
#define wxHAS_RADIO_MENU_ITEMS #define wxHAS_RADIO_MENU_ITEMS
#else #else
#undef wxHAS_RADIO_MENU_ITEMS #undef wxHAS_RADIO_MENU_ITEMS
#endif #endif
// the raw keyboard codes are generated under wxGTK and wxMSW only /* the raw keyboard codes are generated under wxGTK and wxMSW only */
#if defined(__WXGTK__) || defined(__WXMSW__) #if defined(__WXGTK__) || defined(__WXMSW__)
#define wxHAS_RAW_KEY_CODES #define wxHAS_RAW_KEY_CODES
#else #else
#undef wxHAS_RAW_KEY_CODES #undef wxHAS_RAW_KEY_CODES
#endif #endif
// detect SmartPhone /* detect SmartPhone */
#ifdef WIN32_PLATFORM_WFSP #ifdef WIN32_PLATFORM_WFSP
#ifdef wxUSE_SMARTPHONE #ifdef wxUSE_SMARTPHONE
#undef wxUSE_SMARTPHONE #undef wxUSE_SMARTPHONE
@@ -35,7 +37,7 @@
#define wxUSE_SMARTPHONE 1 #define wxUSE_SMARTPHONE 1
#endif #endif
// taskbar is only implemented in wxMSW and X11 ports /* taskbar is only implemented in wxMSW and X11 ports */
#if defined(__WXMSW__) || \ #if defined(__WXMSW__) || \
defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__)
#define wxHAS_TASK_BAR_ICON #define wxHAS_TASK_BAR_ICON
@@ -43,16 +45,16 @@
#undef wxHAS_TASK_BAR_ICON #undef wxHAS_TASK_BAR_ICON
#endif #endif
// wxIconLocation appeared in the middle of 2.5.0 so it's handy to have a /* wxIconLocation appeared in the middle of 2.5.0 so it's handy to have a */
// separate define for it /* separate define for it */
#define wxHAS_ICON_LOCATION #define wxHAS_ICON_LOCATION
// same for wxCrashReport /* same for wxCrashReport */
#ifdef __WXMSW__ #ifdef __WXMSW__
#define wxHAS_CRASH_REPORT #define wxHAS_CRASH_REPORT
#else #else
#undef wxHAS_CRASH_REPORT #undef wxHAS_CRASH_REPORT
#endif #endif
#endif // _WX_FEATURES_H_ #endif /* _WX_FEATURES_H_ */

2
include/wx/msw/chkconf.h
View File

@@ -9,6 +9,8 @@
* Licence: wxWindows licence * Licence: wxWindows licence
*/ */
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
#ifndef _WX_MSW_CHKCONF_H_ #ifndef _WX_MSW_CHKCONF_H_
#define _WX_MSW_CHKCONF_H_ #define _WX_MSW_CHKCONF_H_

44
include/wx/version.h
View File

@@ -1,50 +1,52 @@
///////////////////////////////////////////////////////////////////////////// /* /////////////////////////////////////////////////////////////////////////// */
// Name: wx/version.h /* Name: wx/version.h */
// Purpose: wxWindows version numbers /* Purpose: wxWindows version numbers */
// Author: Julian Smart /* Author: Julian Smart */
// Modified by: /* Modified by: */
// Created: 29/01/98 /* Created: 29/01/98 */
// RCS-ID: $Id$ /* RCS-ID: $Id$ */
// Copyright: (c) 1998 Julian Smart /* Copyright: (c) 1998 Julian Smart */
// Licence: wxWindows licence /* Licence: wxWindows licence */
///////////////////////////////////////////////////////////////////////////// /* /////////////////////////////////////////////////////////////////////////// */
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
#ifndef _WX_VERSION_H_ #ifndef _WX_VERSION_H_
#define _WX_VERSION_H_ #define _WX_VERSION_H_
// the constants below must be changed with each new version /* the constants below must be changed with each new version */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// NB: this file is parsed by Perl code in tmake templates in distrib/msw/tmake /* NB: this file is parsed by Perl code in tmake templates in distrib/msw/tmake */
// so don't change its format too much or they could break /* so don't change its format too much or they could break */
#define wxMAJOR_VERSION 2 #define wxMAJOR_VERSION 2
#define wxMINOR_VERSION 5 #define wxMINOR_VERSION 5
#define wxRELEASE_NUMBER 1 #define wxRELEASE_NUMBER 1
#define wxVERSION_STRING _T("wxWindows 2.5.1") #define wxVERSION_STRING _T("wxWindows 2.5.1")
// nothing to update below this line when updating the version /* nothing to update below this line when updating the version */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// helpers for wxVERSION_NUM_XXX /* helpers for wxVERSION_NUM_XXX */
#define wxMAKE_VERSION_STRING(x, y, z) #x #y #z #define wxMAKE_VERSION_STRING(x, y, z) #x #y #z
#define wxMAKE_VERSION_DOT_STRING(x, y, z) #x "." #y "." #z #define wxMAKE_VERSION_DOT_STRING(x, y, z) #x "." #y "." #z
// these are used by src/msw/version.rc and should always be ASCII, not Unicode /* these are used by src/msw/version.rc and should always be ASCII, not Unicode */
#define wxVERSION_NUM_STRING \ #define wxVERSION_NUM_STRING \
wxMAKE_VERSION_STRING(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) wxMAKE_VERSION_STRING(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER)
#define wxVERSION_NUM_DOT_STRING \ #define wxVERSION_NUM_DOT_STRING \
wxMAKE_VERSION_DOT_STRING(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) wxMAKE_VERSION_DOT_STRING(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER)
// some more defines, not really sure if they're [still] useful /* some more defines, not really sure if they're [still] useful */
#define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
#define wxBETA_NUMBER 0 #define wxBETA_NUMBER 0
#define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0) #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
// check if the current version is at least major.minor.release /* check if the current version is at least major.minor.release */
#define wxCHECK_VERSION(major,minor,release) \ #define wxCHECK_VERSION(major,minor,release) \
(wxMAJOR_VERSION > (major) || \ (wxMAJOR_VERSION > (major) || \
(wxMAJOR_VERSION == (major) && wxMINOR_VERSION > (minor)) || \ (wxMAJOR_VERSION == (major) && wxMINOR_VERSION > (minor)) || \
(wxMAJOR_VERSION == (major) && wxMINOR_VERSION == (minor) && wxRELEASE_NUMBER >= (release))) (wxMAJOR_VERSION == (major) && wxMINOR_VERSION == (minor) && wxRELEASE_NUMBER >= (release)))
#endif // _WX_VERSION_H_ #endif /* _WX_VERSION_H_ */

436
include/wx/wxchar.h
View File

@@ -1,13 +1,15 @@
///////////////////////////////////////////////////////////////////////////// /* /////////////////////////////////////////////////////////////////////////// */
// Name: wx/wxchar.h /* Name: wx/wxchar.h */
// Purpose: Declarations common to wx char/wchar_t usage (wide chars) /* Purpose: Declarations common to wx char/wchar_t usage (wide chars) */
// Author: Joel Farley, Ove K<>ven /* Author: Joel Farley, Ove K<>ven */
// Modified by: Vadim Zeitlin, Robert Roebling /* Modified by: Vadim Zeitlin, Robert Roebling */
// Created: 1998/06/12 /* Created: 1998/06/12 */
// RCS-ID: $Id$ /* RCS-ID: $Id$ */
// Copyright: (c) 1998-2002 wxWindows dev team /* Copyright: (c) 1998-2002 wxWindows dev team */
// Licence: wxWindows licence /* Licence: wxWindows licence */
///////////////////////////////////////////////////////////////////////////// /* /////////////////////////////////////////////////////////////////////////// */
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
#ifndef _WX_WXCHAR_H_ #ifndef _WX_WXCHAR_H_
#define _WX_WXCHAR_H_ #define _WX_WXCHAR_H_
@@ -16,15 +18,15 @@
#pragma interface "wxchar.h" #pragma interface "wxchar.h"
#endif #endif
#include "wx/defs.h" // for wxUSE_UNICODE #include "wx/defs.h" /* for wxUSE_UNICODE */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// check whether we have wchar_t and which size it is if we do /* check whether we have wchar_t and which size it is if we do */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
#if !defined(wxUSE_WCHAR_T) #if !defined(wxUSE_WCHAR_T)
#if defined(__WIN16__) #if defined(__WIN16__)
// no wchar_t under Win16 regadrless of compiler used /* no wchar_t under Win16 regadrless of compiler used */
#define wxUSE_WCHAR_T 0 #define wxUSE_WCHAR_T 0
#elif defined(__UNIX__) #elif defined(__UNIX__)
#if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || defined(__DARWIN__) #if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || defined(__DARWIN__)
@@ -39,36 +41,36 @@
#elif defined(__VISAGECPP__) && (__IBMCPP__ < 400) #elif defined(__VISAGECPP__) && (__IBMCPP__ < 400)
#define wxUSE_WCHAR_T 0 #define wxUSE_WCHAR_T 0
#else #else
// add additional compiler checks if this fails /* add additional compiler checks if this fails */
#define wxUSE_WCHAR_T 1 #define wxUSE_WCHAR_T 1
#endif #endif
#endif // !defined(wxUSE_WCHAR_T) #endif /* !defined(wxUSE_WCHAR_T) */
// Unicode support requires wchar_t /* Unicode support requires wchar_t */
#if wxUSE_UNICODE && !wxUSE_WCHAR_T #if wxUSE_UNICODE && !wxUSE_WCHAR_T
#error "wchar_t must be available in Unicode build" #error "wchar_t must be available in Unicode build"
#endif // Unicode #endif /* Unicode */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// standard headers we need here /* standard headers we need here */
// /* */
// NB: don't include any wxWindows headers here because almost of them include /* NB: don't include any wxWindows headers here because almost of them include */
// this one! /* this one! */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// Required for wxPrintf() etc /* Required for wxPrintf() etc */
#include <stdarg.h> #include <stdarg.h>
// Almost all compiler have strdup(), but not quite all: CodeWarrior under Mac /* Almost all compiler have strdup(), but not quite all: CodeWarrior under Mac */
// and VC++ for Windows CE don't provide it /* and VC++ for Windows CE don't provide it */
#if !(defined(__MWERKS__) && defined(__WXMAC__)) && !defined(__WXWINCE__) #if !(defined(__MWERKS__) && defined(__WXMAC__)) && !defined(__WXWINCE__)
// use #define, not inline wrapper, as it is tested with #ifndef below /* use #define, not inline wrapper, as it is tested with #ifndef below */
#define wxStrdupA strdup #define wxStrdupA strdup
#endif #endif
// non Unix compilers which do have wchar.h (but not tchar.h which is included /* non Unix compilers which do have wchar.h (but not tchar.h which is included */
// below and which includes wchar.h anyhow). /* below and which includes wchar.h anyhow). */
// Actually MinGW has tchar.h, but it does not include wchar.h /* Actually MinGW has tchar.h, but it does not include wchar.h */
#if defined(__MWERKS__) || defined(__VISAGECPP__) || defined(__MINGW32__) #if defined(__MWERKS__) || defined(__VISAGECPP__) || defined(__MINGW32__)
#ifndef HAVE_WCHAR_H #ifndef HAVE_WCHAR_H
#define HAVE_WCHAR_H #define HAVE_WCHAR_H
@@ -77,34 +79,34 @@
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
#ifdef HAVE_WCHAR_H #ifdef HAVE_WCHAR_H
// the current (as of Nov 2002) version of cygwin has a bug in its /* the current (as of Nov 2002) version of cygwin has a bug in its */
// wchar.h -- there is no extern "C" around the declarations in it and /* wchar.h -- there is no extern "C" around the declarations in it and */
// this results in linking errors later; also, at least on some /* this results in linking errors later; also, at least on some */
// Cygwin versions, wchar.h requires sys/types.h /* Cygwin versions, wchar.h requires sys/types.h */
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#include <sys/types.h> #include <sys/types.h>
extern "C" { extern "C" {
#endif // Cygwin #endif /* Cygwin */
#include <wchar.h> #include <wchar.h>
#ifdef __CYGWIN__ #ifdef __CYGWIN__
} }
#endif // Cygwin #endif /* Cygwin */
#elif defined(HAVE_WCSTR_H) #elif defined(HAVE_WCSTR_H)
// old compilers have relevant declarations here /* old compilers have relevant declarations here */
#include <wcstr.h> #include <wcstr.h>
#elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__) #elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
// include stdlib.h for wchar_t /* include stdlib.h for wchar_t */
#include <stdlib.h> #include <stdlib.h>
#endif // HAVE_WCHAR_H #endif /* HAVE_WCHAR_H */
#endif // wxUSE_WCHAR_T #endif /* wxUSE_WCHAR_T */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// define wxHAVE_TCHAR_SUPPORT for the compilers which support the TCHAR type /* define wxHAVE_TCHAR_SUPPORT for the compilers which support the TCHAR type */
// mapped to either char or wchar_t depending on the ASCII/Unicode mode and have /* mapped to either char or wchar_t depending on the ASCII/Unicode mode and have */
// the function mapping _tfoo() -> foo() or wfoo() /* the function mapping _tfoo() -> foo() or wfoo() */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// VC++ and BC++ starting with 5.2 have TCHAR support /* VC++ and BC++ starting with 5.2 have TCHAR support */
#ifdef __VISUALC__ #ifdef __VISUALC__
#define wxHAVE_TCHAR_SUPPORT #define wxHAVE_TCHAR_SUPPORT
#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520) #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
@@ -118,98 +120,98 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#elif 0 && defined(__VISAGECPP__) && (__IBMCPP__ >= 400) #elif 0 && defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
// VZ: the old VisualAge definitions were completely wrong and had no /* VZ: the old VisualAge definitions were completely wrong and had no */
// chance at all to work in Unicode build anyhow so let's pretend that /* chance at all to work in Unicode build anyhow so let's pretend that */
// VisualAge does _not_ support TCHAR for the moment (as indicated by /* VisualAge does _not_ support TCHAR for the moment (as indicated by */
// "0 &&" above) until someone really has time to delve into Unicode /* "0 &&" above) until someone really has time to delve into Unicode */
// issues under OS/2 /* issues under OS/2 */
// VisualAge 4.0+ supports TCHAR /* VisualAge 4.0+ supports TCHAR */
#define wxHAVE_TCHAR_SUPPORT #define wxHAVE_TCHAR_SUPPORT
#endif // compilers with (good) TCHAR support #endif /* compilers with (good) TCHAR support */
#ifdef __MWERKS__ #ifdef __MWERKS__
#define HAVE_WPRINTF #define HAVE_WPRINTF
#endif #endif
#ifdef wxHAVE_TCHAR_SUPPORT #ifdef wxHAVE_TCHAR_SUPPORT
// get TCHAR definition if we've got it /* get TCHAR definition if we've got it */
#include <tchar.h> #include <tchar.h>
// we surely do have wchar_t if we have TCHAR /* we surely do have wchar_t if we have TCHAR */
#ifndef wxUSE_WCHAR_T #ifndef wxUSE_WCHAR_T
#define wxUSE_WCHAR_T 1 #define wxUSE_WCHAR_T 1
#endif // !defined(wxUSE_WCHAR_T) #endif /* !defined(wxUSE_WCHAR_T) */
// and we also do have wcslen() /* and we also do have wcslen() */
#ifndef HAVE_WCSLEN #ifndef HAVE_WCSLEN
#define HAVE_WCSLEN #define HAVE_WCSLEN
#endif #endif
#endif // wxHAVE_TCHAR_SUPPORT #endif /* wxHAVE_TCHAR_SUPPORT */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// define wxChar type /* define wxChar type */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// TODO: define wxCharInt to be equal to either int or wint_t? /* TODO: define wxCharInt to be equal to either int or wint_t? */
#if !wxUSE_UNICODE #if !wxUSE_UNICODE
typedef char wxChar; typedef char wxChar;
typedef signed char wxSChar; typedef signed char wxSChar;
typedef unsigned char wxUChar; typedef unsigned char wxUChar;
#else // Unicode #else /* Unicode */
// VZ: note that VC++ defines _T[SU]CHAR simply as wchar_t and not as /* VZ: note that VC++ defines _T[SU]CHAR simply as wchar_t and not as */
// signed/unsigned version of it which (a) makes sense to me (unlike /* signed/unsigned version of it which (a) makes sense to me (unlike */
// char wchar_t is always unsigned) and (b) was how the previous /* char wchar_t is always unsigned) and (b) was how the previous */
// definitions worked so keep it like this /* definitions worked so keep it like this */
// GNU libc has __WCHAR_TYPE__ which requires special treatment, see /* GNU libc has __WCHAR_TYPE__ which requires special treatment, see */
// comment below /* comment below */
#if !defined(__WCHAR_TYPE__) || \ #if !defined(__WCHAR_TYPE__) || \
(!defined(__GNUC__) || wxCHECK_GCC_VERSION(2, 96)) (!defined(__GNUC__) || wxCHECK_GCC_VERSION(2, 96))
// standard case /* standard case */
typedef wchar_t wxChar; typedef wchar_t wxChar;
typedef wchar_t wxSChar; typedef wchar_t wxSChar;
typedef wchar_t wxUChar; typedef wchar_t wxUChar;
#else // __WCHAR_TYPE__ and gcc < 2.96 #else /* __WCHAR_TYPE__ and gcc < 2.96 */
// VS: wxWindows used to define wxChar as __WCHAR_TYPE__ here. However, /* VS: wxWindows used to define wxChar as __WCHAR_TYPE__ here. However, */
// this doesn't work with new GCC 3.x compilers because wchar_t is /* this doesn't work with new GCC 3.x compilers because wchar_t is */
// C++'s builtin type in the new standard. OTOH, old compilers (GCC /* C++'s builtin type in the new standard. OTOH, old compilers (GCC */
// 2.x) won't accept new definition of wx{S,U}Char, therefore we /* 2.x) won't accept new definition of wx{S,U}Char, therefore we */
// have to define wxChar conditionally depending on detected /* have to define wxChar conditionally depending on detected */
// compiler & compiler version. /* compiler & compiler version. */
// with old definition of wxChar. /* with old definition of wxChar. */
typedef __WCHAR_TYPE__ wxChar; typedef __WCHAR_TYPE__ wxChar;
typedef __WCHAR_TYPE__ wxSChar; typedef __WCHAR_TYPE__ wxSChar;
typedef __WCHAR_TYPE__ wxUChar; typedef __WCHAR_TYPE__ wxUChar;
#endif // __WCHAR_TYPE__ #endif /* __WCHAR_TYPE__ */
#endif // ASCII/Unicode #endif /* ASCII/Unicode */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// define _T() and related macros /* define _T() and related macros */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// BSD systems define _T() to be something different in ctype.h, override it /* BSD systems define _T() to be something different in ctype.h, override it */
#if defined(__FreeBSD__) || defined(__DARWIN__) #if defined(__FreeBSD__) || defined(__DARWIN__)
#include <ctype.h> #include <ctype.h>
#undef _T #undef _T
#endif #endif
// could already be defined by tchar.h (it's quasi standard) /* could already be defined by tchar.h (it's quasi standard) */
#ifndef _T #ifndef _T
#if !wxUSE_UNICODE #if !wxUSE_UNICODE
#define _T(x) x #define _T(x) x
#else // Unicode #else /* Unicode */
#define _T(x) L ## x #define _T(x) L ## x
#endif // ASCII/Unicode #endif /* ASCII/Unicode */
#endif // !defined(_T) #endif /* !defined(_T) */
// although global macros with such names are normally bad, we want to have /* although global macros with such names are normally bad, we want to have */
// another name for _T() which should be used to avoid confusion between _T() /* another name for _T() which should be used to avoid confusion between _T() */
// and _() in wxWindows sources /* and _() in wxWindows sources */
#define wxT(x) _T(x) #define wxT(x) _T(x)
// Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs /* Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs */
#ifndef __TFILE__ #ifndef __TFILE__
#define __XFILE__(x) wxT(x) #define __XFILE__(x) wxT(x)
#define __TFILE__ __XFILE__(__FILE__) #define __TFILE__ __XFILE__(__FILE__)
@@ -225,18 +227,18 @@
#define __TTIME__ __XTIME__(__TIME__) #define __TTIME__ __XTIME__(__TIME__)
#endif #endif
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// define wxFoo() function for each standard foo() function whose signature /* define wxFoo() function for each standard foo() function whose signature */
// (exceptionally including the return type) includes any mention of char: /* (exceptionally including the return type) includes any mention of char: */
// wxFoo() is going to be a Unicode-friendly version of foo(), i.e. will have /* wxFoo() is going to be a Unicode-friendly version of foo(), i.e. will have */
// the same signature but with char replaced by wxChar which allows us to use /* the same signature but with char replaced by wxChar which allows us to use */
// it in Unicode build as well /* it in Unicode build as well */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
#ifdef wxHAVE_TCHAR_SUPPORT #ifdef wxHAVE_TCHAR_SUPPORT
#include <ctype.h> #include <ctype.h>
// ctype.h functions /* ctype.h functions */
#define wxIsalnum _istalnum #define wxIsalnum _istalnum
#define wxIsalpha _istalpha #define wxIsalpha _istalpha
#define wxIsctrl _istctrl #define wxIsctrl _istctrl
@@ -251,21 +253,21 @@
#define wxTolower _totlower #define wxTolower _totlower
#define wxToupper _totupper #define wxToupper _totupper
// locale.h functons /* locale.h functons */
#define wxSetlocale _tsetlocale #define wxSetlocale _tsetlocale
// string.h functions /* string.h functions */
#define wxStrcat _tcscat #define wxStrcat _tcscat
#define wxStrchr _tcschr #define wxStrchr _tcschr
#define wxStrcmp _tcscmp #define wxStrcmp _tcscmp
#define wxStrcoll _tcscoll #define wxStrcoll _tcscoll
#define wxStrcpy _tcscpy #define wxStrcpy _tcscpy
#define wxStrcspn _tcscspn #define wxStrcspn _tcscspn
#define wxStrdupW _wcsdup // notice the 'W'! #define wxStrdupW _wcsdup /* notice the 'W'! */
#define wxStrftime _tcsftime #define wxStrftime _tcsftime
#define wxStricmp _tcsicmp #define wxStricmp _tcsicmp
#define wxStrnicmp _tcsnicmp #define wxStrnicmp _tcsnicmp
#define wxStrlen_ _tcslen // used in wxStrlen inline function #define wxStrlen_ _tcslen /* used in wxStrlen inline function */
#define wxStrncat _tcsncat #define wxStrncat _tcsncat
#define wxStrncmp _tcsncmp #define wxStrncmp _tcsncmp
#define wxStrncpy _tcsncpy #define wxStrncpy _tcsncpy
@@ -278,7 +280,7 @@
#define wxStrtoul _tcstoul #define wxStrtoul _tcstoul
#define wxStrxfrm _tcsxfrm #define wxStrxfrm _tcsxfrm
// stdio.h functions /* stdio.h functions */
#define wxFgetc _fgettc #define wxFgetc _fgettc
#define wxFgetchar _fgettchar #define wxFgetchar _fgettchar
#define wxFgets _fgetts #define wxFgets _fgetts
@@ -307,15 +309,15 @@
#define wxVsscanf _vstscanf #define wxVsscanf _vstscanf
#define wxVsprintf _vstprintf #define wxVsprintf _vstprintf
// special case: not all TCHAR-aware compilers have those /* special case: not all TCHAR-aware compilers have those */
#if defined(__VISUALC__) || \ #if defined(__VISUALC__) || \
(defined(__BORLANDC__) && __BORLANDC__ >= 0x540) (defined(__BORLANDC__) && __BORLANDC__ >= 0x540)
#define wxVsnprintf_ _vsntprintf #define wxVsnprintf_ _vsntprintf
#define wxSnprintf_ _sntprintf #define wxSnprintf_ _sntprintf
#endif #endif
// special case: these functions are missing under Win9x with Unicows so we /* special case: these functions are missing under Win9x with Unicows so we */
// have to implement them ourselves /* have to implement them ourselves */
#if wxUSE_UNICODE_MSLU #if wxUSE_UNICODE_MSLU
#define wxRemove wxMSLU__tremove #define wxRemove wxMSLU__tremove
#define wxRename wxMSLU__trename #define wxRename wxMSLU__trename
@@ -328,23 +330,23 @@
#endif #endif
#endif #endif
// stdlib.h functions /* stdlib.h functions */
#define wxAtoi _ttoi #define wxAtoi _ttoi
#define wxAtol _ttol #define wxAtol _ttol
// #define wxAtof _tttof -- notice that there is no such thing (why?) /* #define wxAtof _tttof -- notice that there is no such thing (why?) */
#define wxGetenv _tgetenv #define wxGetenv _tgetenv
#define wxSystem _tsystem #define wxSystem _tsystem
// time.h functions /* time.h functions */
#define wxAsctime _tasctime #define wxAsctime _tasctime
#define wxCtime _tctime #define wxCtime _tctime
#else // !TCHAR-aware compilers #else /* !TCHAR-aware compilers */
#if wxUSE_UNICODE #if wxUSE_UNICODE
#include <wctype.h> #include <wctype.h>
// this is probably glibc-specific /* this is probably glibc-specific */
#if defined(__WCHAR_TYPE__) #if defined(__WCHAR_TYPE__)
// ctype.h functions (wctype.h) /* ctype.h functions (wctype.h) */
#define wxIsalnum iswalnum #define wxIsalnum iswalnum
#define wxIsalpha iswalpha #define wxIsalpha iswalpha
#define wxIsctrl iswcntrl #define wxIsctrl iswcntrl
@@ -358,24 +360,24 @@
#define wxIsxdigit iswxdigit #define wxIsxdigit iswxdigit
#if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0) #if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)
// /usr/include/wctype.h incorrectly declares translations /* /usr/include/wctype.h incorrectly declares translations */
// tables which provokes tons of compile-time warnings -- try /* tables which provokes tons of compile-time warnings -- try */
// to correct this /* to correct this */
#define wxTolower(wc) towctrans((wc), (wctrans_t)__ctype_tolower) #define wxTolower(wc) towctrans((wc), (wctrans_t)__ctype_tolower)
#define wxToupper(wc) towctrans((wc), (wctrans_t)__ctype_toupper) #define wxToupper(wc) towctrans((wc), (wctrans_t)__ctype_toupper)
#else // !glibc 2.0 #else /* !glibc 2.0 */
#define wxTolower towlower #define wxTolower towlower
#define wxToupper towupper #define wxToupper towupper
#endif // gcc/!gcc #endif /* gcc/!gcc */
// string.h functions (wchar.h) /* string.h functions (wchar.h) */
#define wxStrcat wcscat #define wxStrcat wcscat
#define wxStrchr wcschr #define wxStrchr wcschr
#define wxStrcmp wcscmp #define wxStrcmp wcscmp
#define wxStrcoll wcscoll #define wxStrcoll wcscoll
#define wxStrcpy wcscpy #define wxStrcpy wcscpy
#define wxStrcspn wcscspn #define wxStrcspn wcscspn
#define wxStrlen_ wxWcslen // wxStrlen_() is used in wxStrlen() #define wxStrlen_ wxWcslen /* wxStrlen_() is used in wxStrlen() */
#define wxStrncat wcsncat #define wxStrncat wcsncat
#define wxStrncmp wcsncmp #define wxStrncmp wcsncmp
#define wxStrncpy wcsncpy #define wxStrncpy wcsncpy
@@ -415,16 +417,16 @@
#define wxPutchar(wch) wxPutc(wch, stdout) #define wxPutchar(wch) wxPutc(wch, stdout)
#endif #endif
// we need %s to %ls conversion for printf and scanf etc /* we need %s to %ls conversion for printf and scanf etc */
#define wxNEED_PRINTF_CONVERSION #define wxNEED_PRINTF_CONVERSION
// glibc doesn't have wide char equivalents of the other stuff so /* glibc doesn't have wide char equivalents of the other stuff so */
// use our own versions /* use our own versions */
#define wxNEED_WX_STDIO_H #define wxNEED_WX_STDIO_H
#define wxNEED_WX_STDLIB_H #define wxNEED_WX_STDLIB_H
#define wxNEED_WX_TIME_H #define wxNEED_WX_TIME_H
#elif defined(__MWERKS__) && ( defined(macintosh) || defined(__MACH__) ) #elif defined(__MWERKS__) && ( defined(macintosh) || defined(__MACH__) )
// ctype.h functions (wctype.h) /* ctype.h functions (wctype.h) */
#define wxIsalnum iswalnum #define wxIsalnum iswalnum
#define wxIsalpha iswalpha #define wxIsalpha iswalpha
#define wxIsctrl iswcntrl #define wxIsctrl iswcntrl
@@ -439,14 +441,14 @@
#define wxTolower towlower #define wxTolower towlower
#define wxToupper towupper #define wxToupper towupper
// string.h functions (wchar.h) /* string.h functions (wchar.h) */
#define wxStrcat wcscat #define wxStrcat wcscat
#define wxStrchr wcschr #define wxStrchr wcschr
#define wxStrcmp wcscmp #define wxStrcmp wcscmp
#define wxStrcoll wcscoll #define wxStrcoll wcscoll
#define wxStrcpy wcscpy #define wxStrcpy wcscpy
#define wxStrcspn wcscspn #define wxStrcspn wcscspn
#define wxStrlen_ wxWcslen // wxStrlen_() is used in wxStrlen() #define wxStrlen_ wxWcslen /* wxStrlen_() is used in wxStrlen() */
#define wxStrncat wcsncat #define wxStrncat wcsncat
#define wxStrncmp wcsncmp #define wxStrncmp wcsncmp
#define wxStrncpy wcsncpy #define wxStrncpy wcsncpy
@@ -475,21 +477,21 @@
#define wxPutchar putwchar #define wxPutchar putwchar
#define wxFputs fputws #define wxFputs fputws
// stdio.h functions /* stdio.h functions */
#define wxNEED_WX_STDIO_H #define wxNEED_WX_STDIO_H
// stdlib.h functions /* stdlib.h functions */
#define wxAtof watof #define wxAtof watof
#define wxAtoi watoi #define wxAtoi watoi
#define wxAtol watol #define wxAtol watol
#define wxGetenv(a) ((wxChar*)NULL) #define wxGetenv(a) ((wxChar*)NULL)
#define wxSystem(a) ((int)NULL) #define wxSystem(a) ((int)NULL)
// time.h functions /* time.h functions */
#define wxAsctime wasciitime #define wxAsctime wasciitime
#define wxCtime wctime #define wxCtime wctime
// #define wxStrftime wcsftime /* #define wxStrftime wcsftime */
/* /*
#define wxNEED_FPUTWC #define wxNEED_FPUTWC
@@ -502,22 +504,22 @@
#define wxPuts(ws) wxFputs(ws, stdout) #define wxPuts(ws) wxFputs(ws, stdout)
#define wxPutchar(wch) wxPutc(wch, stdout) #define wxPutchar(wch) wxPutc(wch, stdout)
// we need %s to %ls conversion for printf and scanf etc /* we need %s to %ls conversion for printf and scanf etc */
#define wxNEED_PRINTF_CONVERSION #define wxNEED_PRINTF_CONVERSION
// glibc doesn't have wide char equivalents of the other stuff so /* glibc doesn't have wide char equivalents of the other stuff so */
// use our own versions /* use our own versions */
#define wxNEED_WX_STDIO_H #define wxNEED_WX_STDIO_H
#define wxNEED_WX_STDLIB_H #define wxNEED_WX_STDLIB_H
*/ */
#define wxNEED_WX_TIME_H #define wxNEED_WX_TIME_H
#else // !metrowerks for apple #else /* !metrowerks for apple */
#error "Please define wide character functions for your environment" #error "Please define wide character functions for your environment"
#endif #endif
#else // ASCII #else /* ASCII */
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
// ctype.h functions /* ctype.h functions */
#define wxIsalnum isalnum #define wxIsalnum isalnum
#define wxIsalpha isalpha #define wxIsalpha isalpha
#define wxIsctrl isctrl #define wxIsctrl isctrl
@@ -532,10 +534,10 @@
#define wxTolower tolower #define wxTolower tolower
#define wxToupper toupper #define wxToupper toupper
// locale.h functons /* locale.h functons */
#define wxSetlocale setlocale #define wxSetlocale setlocale
// string.h functions /* string.h functions */
#define wxStrcat strcat #define wxStrcat strcat
#define wxStrchr strchr #define wxStrchr strchr
#define wxStrcmp strcmp #define wxStrcmp strcmp
@@ -543,8 +545,8 @@
#define wxStrcpy strcpy #define wxStrcpy strcpy
#define wxStrcspn strcspn #define wxStrcspn strcspn
// wxStricmp and wxStrnicmp are defined below /* wxStricmp and wxStrnicmp are defined below */
#define wxStrlen_ strlen // used in wxStrlen inline function #define wxStrlen_ strlen /* used in wxStrlen inline function */
#define wxStrncat strncat #define wxStrncat strncat
#define wxStrncmp strncmp #define wxStrncmp strncmp
#define wxStrncpy strncpy #define wxStrncpy strncpy
@@ -560,7 +562,7 @@
#define wxStrtoul strtoul #define wxStrtoul strtoul
#define wxStrxfrm strxfrm #define wxStrxfrm strxfrm
// stdio.h functions /* stdio.h functions */
#define wxFopen fopen #define wxFopen fopen
#define wxFreopen freopen #define wxFreopen freopen
#define wxRemove remove #define wxRemove remove
@@ -593,27 +595,27 @@
#define wxVsscanf vsscanf #define wxVsscanf vsscanf
#define wxVsprintf vsprintf #define wxVsprintf vsprintf
// stdlib.h functions /* stdlib.h functions */
#define wxAtof atof #define wxAtof atof
#define wxAtoi atoi #define wxAtoi atoi
#define wxAtol atol #define wxAtol atol
#define wxGetenv getenv #define wxGetenv getenv
#define wxSystem system #define wxSystem system
// time.h functions /* time.h functions */
#define wxAsctime asctime #define wxAsctime asctime
#define wxCtime ctime #define wxCtime ctime
#define wxStrftime strftime #define wxStrftime strftime
#endif // Unicode/ASCII #endif /* Unicode/ASCII */
#endif // TCHAR-aware compilers/the others #endif /* TCHAR-aware compilers/the others */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// various special cases /* various special cases */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// define wxStricmp and wxStrnicmp for various compilers /* define wxStricmp and wxStrnicmp for various compilers */
// /* */
// note that in Unicode mode we definitely are going to need our own version /* note that in Unicode mode we definitely are going to need our own version */
#if !defined(wxStricmp) && !wxUSE_UNICODE #if !defined(wxStricmp) && !wxUSE_UNICODE
#if defined(__BORLANDC__) || defined(__WATCOMC__) || \ #if defined(__BORLANDC__) || defined(__WATCOMC__) || \
defined(__SALFORDC__) || defined(__VISAGECPP__) || \ defined(__SALFORDC__) || defined(__VISAGECPP__) || \
@@ -627,13 +629,13 @@
#elif defined(__UNIX__) || defined(__GNUWIN32__) #elif defined(__UNIX__) || defined(__GNUWIN32__)
#define wxStricmp strcasecmp #define wxStricmp strcasecmp
#define wxStrnicmp strncasecmp #define wxStrnicmp strncasecmp
// #else -- use wxWindows implementation /* #else -- use wxWindows implementation */
#endif #endif
#endif // !defined(wxStricmp) #endif /* !defined(wxStricmp) */
// define wxWcslen() which should be always available if wxUSE_WCHAR_T == 1 (as /* define wxWcslen() which should be always available if wxUSE_WCHAR_T == 1 (as */
// it's used in wx/buffer.h -- and also might be used just below by wxStrlen() /* it's used in wx/buffer.h -- and also might be used just below by wxStrlen() */
// when wxStrlen_() is #define'd as wxWcslen so do it before defining wxStrlen) /* when wxStrlen_() is #define'd as wxWcslen so do it before defining wxStrlen) */
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
#ifdef HAVE_WCSLEN #ifdef HAVE_WCSLEN
#define wxWcslen wcslen #define wxWcslen wcslen
@@ -647,30 +649,34 @@
return n; return n;
} }
#endif #endif
#endif // wxUSE_WCHAR_T #endif /* wxUSE_WCHAR_T */
// checks whether the passed in pointer is NULL and if the string is empty /* checks whether the passed in pointer is NULL and if the string is empty */
#ifdef __cplusplus
inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; } inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
// safe version of strlen() (returns 0 if passed NULL pointer) /* safe version of strlen() (returns 0 if passed NULL pointer) */
inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; } inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; }
#endif
// each of strdup() and wcsdup() may or may not be available but we need both
// of them anyhow for wx/buffer.h so we define the missing one(s) in /* each of strdup() and wcsdup() may or may not be available but we need both */
// wxchar.cpp and so we should always have both wxStrdupA and wxStrdupW /* of them anyhow for wx/buffer.h so we define the missing one(s) in */
// defined -- if this is somehow not the case in some situations, please /* wxchar.cpp and so we should always have both wxStrdupA and wxStrdupW */
// correct that and not the lines here /* defined -- if this is somehow not the case in some situations, please */
/* correct that and not the lines here */
#if wxUSE_UNICODE #if wxUSE_UNICODE
#define wxStrdup wxStrdupW #define wxStrdup wxStrdupW
#else #else
#define wxStrdup wxStrdupA #define wxStrdup wxStrdupA
#endif #endif
WXDLLIMPEXP_BASE bool wxOKlibc(); // for internal use #ifdef __cplusplus
WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
// ---------------------------------------------------------------------------- #endif
// printf() family saga /* ---------------------------------------------------------------------------- */
// ---------------------------------------------------------------------------- /* printf() family saga */
/* ---------------------------------------------------------------------------- */
/* /*
For some systems vsnprintf() exists in the system libraries but not in the For some systems vsnprintf() exists in the system libraries but not in the
@@ -679,7 +685,7 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); // for internal use
#if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL) #if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL)
extern "C" extern "C"
int vsnprintf(char *str, size_t size, const char *format, va_list ap); int vsnprintf(char *str, size_t size, const char *format, va_list ap);
#endif // !HAVE_VSNPRINTF_DECL #endif /* !HAVE_VSNPRINTF_DECL */
/* /*
First of all, we always want to define safe snprintf() function to be used First of all, we always want to define safe snprintf() function to be used
@@ -702,19 +708,19 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); // for internal use
#elif defined(HAVE_VSWPRINTF) && !defined(__MINGW32__) #elif defined(HAVE_VSWPRINTF) && !defined(__MINGW32__)
#define wxVsnprintf_ vswprintf #define wxVsnprintf_ vswprintf
#endif #endif
#else // ASCII #else /* ASCII */
// all versions of CodeWarrior supported by wxWindows apparently have /* all versions of CodeWarrior supported by wxWindows apparently have */
// vsnprintf() /* vsnprintf() */
#if defined(HAVE_VSNPRINTF) || defined(__MWERKS__) #if defined(HAVE_VSNPRINTF) || defined(__MWERKS__)
// assume we have snprintf() too if we have vsnprintf() /* assume we have snprintf() too if we have vsnprintf() */
#define wxVsnprintf_ vsnprintf #define wxVsnprintf_ vsnprintf
#define wxSnprintf_ snprintf #define wxSnprintf_ snprintf
#endif #endif
#endif #endif
#endif // wxVsnprintf_ not defined yet #endif /* wxVsnprintf_ not defined yet */
#ifndef wxSnprintf_ #ifndef wxSnprintf_
// no [v]snprintf(), cook our own /* no [v]snprintf(), cook our own */
WXDLLIMPEXP_BASE int wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, WXDLLIMPEXP_BASE int wxSnprintf_(wxChar *buf, size_t len, const wxChar *format,
...) ATTRIBUTE_PRINTF_3; ...) ATTRIBUTE_PRINTF_3;
#endif #endif
@@ -751,11 +757,11 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); // for internal use
#endif #endif
#if defined(wxNEED_PRINTF_CONVERSION) || defined(wxNEED_WPRINTF) #if defined(wxNEED_PRINTF_CONVERSION) || defined(wxNEED_WPRINTF)
// we need to implement all wide character printf and scanf functions /* we need to implement all wide character printf and scanf functions */
// either because we don't have them at all or because they don't have the /* either because we don't have them at all or because they don't have the */
// semantics we need /* semantics we need */
#include <stdio.h> // for FILE #include <stdio.h> /* for FILE */
int wxScanf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_1; int wxScanf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_1;
int wxSscanf( const wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_2; int wxSscanf( const wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_2;
@@ -767,10 +773,10 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); // for internal use
int wxVfprintf( FILE *stream, const wxChar *format, va_list ap ); int wxVfprintf( FILE *stream, const wxChar *format, va_list ap );
int wxVprintf( const wxChar *format, va_list ap ); int wxVprintf( const wxChar *format, va_list ap );
int wxVsprintf( wxChar *str, const wxChar *format, va_list ap ); int wxVsprintf( wxChar *str, const wxChar *format, va_list ap );
#endif // wxNEED_PRINTF_CONVERSION #endif /* wxNEED_PRINTF_CONVERSION */
// these 2 can be simply mapped to the versions with underscore at the end /* these 2 can be simply mapped to the versions with underscore at the end */
// if we don't have to do the conversion /* if we don't have to do the conversion */
#ifdef wxNEED_PRINTF_CONVERSION #ifdef wxNEED_PRINTF_CONVERSION
int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3; int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3;
int wxVsnprintf( wxChar *str, size_t size, const wxChar *format, va_list ap ); int wxVsnprintf( wxChar *str, size_t size, const wxChar *format, va_list ap );
@@ -779,14 +785,14 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); // for internal use
#define wxVsnprintf wxVsnprintf_ #define wxVsnprintf wxVsnprintf_
#endif #endif
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// various functions which might not be available in libc and for which we /* various functions which might not be available in libc and for which we */
// provide our own replacements in wxchar.cpp /* provide our own replacements in wxchar.cpp */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// ctype.h functions /* ctype.h functions */
// /* */
// VZ: note that this is never defined currently /* VZ: note that this is never defined currently */
#ifdef wxNEED_WX_CTYPE_H #ifdef wxNEED_WX_CTYPE_H
WXDLLIMPEXP_BASE int wxIsalnum(wxChar ch); WXDLLIMPEXP_BASE int wxIsalnum(wxChar ch);
WXDLLIMPEXP_BASE int wxIsalpha(wxChar ch); WXDLLIMPEXP_BASE int wxIsalpha(wxChar ch);
@@ -801,19 +807,19 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); // for internal use
WXDLLIMPEXP_BASE int wxIsxdigit(wxChar ch); WXDLLIMPEXP_BASE int wxIsxdigit(wxChar ch);
WXDLLIMPEXP_BASE int wxTolower(wxChar ch); WXDLLIMPEXP_BASE int wxTolower(wxChar ch);
WXDLLIMPEXP_BASE int wxToupper(wxChar ch); WXDLLIMPEXP_BASE int wxToupper(wxChar ch);
#endif // wxNEED_WX_CTYPE_H #endif /* wxNEED_WX_CTYPE_H */
// under VC++ 6.0 isspace() returns 1 for 8 bit chars which completely breaks /* under VC++ 6.0 isspace() returns 1 for 8 bit chars which completely breaks */
// the file parsing -- this may be true for 5.0 as well, update #ifdef then /* the file parsing -- this may be true for 5.0 as well, update #ifdef then */
#if defined(__VISUALC__) && (__VISUALC__ >= 1200) && !wxUSE_UNICODE #if defined(__VISUALC__) && (__VISUALC__ >= 1200) && !wxUSE_UNICODE
#undef wxIsspace #undef wxIsspace
#define wxIsspace(c) ((((unsigned)c) < 128) && isspace(c)) #define wxIsspace(c) ((((unsigned)c) < 128) && isspace(c))
#endif // VC++ #endif /* VC++ */
// string.h functions /* string.h functions */
// /* */
// VZ: this is never defined neither currently /* VZ: this is never defined neither currently */
#ifdef wxNEED_WX_STRING_H #ifdef wxNEED_WX_STRING_H
WXDLLIMPEXP_BASE wxChar * wxStrcat(wxChar *dest, const wxChar *src); WXDLLIMPEXP_BASE wxChar * wxStrcat(wxChar *dest, const wxChar *src);
WXDLLIMPEXP_BASE const wxChar * wxStrchr(const wxChar *s, wxChar c); WXDLLIMPEXP_BASE const wxChar * wxStrchr(const wxChar *s, wxChar c);
@@ -841,7 +847,7 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); // for internal use
WXDLLIMPEXP_BASE long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base); WXDLLIMPEXP_BASE long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base);
WXDLLIMPEXP_BASE unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base); WXDLLIMPEXP_BASE unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base);
WXDLLIMPEXP_BASE size_t wxStrxfrm(wxChar *dest, const wxChar *src, size_t n); WXDLLIMPEXP_BASE size_t wxStrxfrm(wxChar *dest, const wxChar *src, size_t n);
#endif // wxNEED_WX_STRING_H #endif /* wxNEED_WX_STRING_H */
#ifndef wxStrdupA #ifndef wxStrdupA
WXDLLIMPEXP_BASE char *wxStrdupA(const char *psz); WXDLLIMPEXP_BASE char *wxStrdupA(const char *psz);
@@ -868,7 +874,7 @@ class WXDLLIMPEXP_BASE wxWCharBuffer;
WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale); WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
#endif #endif
// stdio.h functions /* stdio.h functions */
#ifdef wxNEED_WX_STDIO_H #ifdef wxNEED_WX_STDIO_H
#include <stdio.h> #include <stdio.h>
WXDLLIMPEXP_BASE FILE * wxFopen(const wxChar *path, const wxChar *mode); WXDLLIMPEXP_BASE FILE * wxFopen(const wxChar *path, const wxChar *mode);
@@ -876,11 +882,11 @@ WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
WXDLLIMPEXP_BASE int wxRemove(const wxChar *path); WXDLLIMPEXP_BASE int wxRemove(const wxChar *path);
WXDLLIMPEXP_BASE int wxRename(const wxChar *oldpath, const wxChar *newpath); WXDLLIMPEXP_BASE int wxRename(const wxChar *oldpath, const wxChar *newpath);
// *printf() family is handled separately /* *printf() family is handled separately */
#endif // wxNEED_WX_STDIO_H #endif /* wxNEED_WX_STDIO_H */
// stdlib.h functions /* stdlib.h functions */
#ifndef wxAtof #ifndef wxAtof
WXDLLIMPEXP_BASE double wxAtof(const wxChar *psz); WXDLLIMPEXP_BASE double wxAtof(const wxChar *psz);
#endif #endif
@@ -893,16 +899,16 @@ WXDLLIMPEXP_BASE int wxSystem(const wxChar *psz);
#endif #endif
// time.h functions /* time.h functions */
#ifdef wxNEED_WX_TIME_H #ifdef wxNEED_WX_TIME_H
#if defined(__MWERKS__) && defined(macintosh) #if defined(__MWERKS__) && defined(macintosh)
#include <time.h> #include <time.h>
#endif #endif
WXDLLIMPEXP_BASE size_t wxStrftime(wxChar *s, size_t max, WXDLLIMPEXP_BASE size_t wxStrftime(wxChar *s, size_t max,
const wxChar *fmt, const struct tm *tm); const wxChar *fmt, const struct tm *tm);
#endif // wxNEED_WX_TIME_H #endif /* wxNEED_WX_TIME_H */
// missing functions in some WinCE versions /* missing functions in some WinCE versions */
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
#if (_WIN32_WCE < 300) #if (_WIN32_WCE < 300)
WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
@@ -915,12 +921,12 @@ WXDLLIMPEXP_BASE int isascii( int c );
#endif #endif
#endif #endif
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
// multibyte to wide char conversion functions and macros /* multibyte to wide char conversion functions and macros */
// ---------------------------------------------------------------------------- /* ---------------------------------------------------------------------------- */
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
// multibyte<->widechar conversion /* multibyte<->widechar conversion */
WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n); WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n);
WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n); WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n);
@@ -935,8 +941,8 @@ WXDLLIMPEXP_BASE int isascii( int c );
#define wxWC2WX wxWC2MB #define wxWC2WX wxWC2MB
#define wxWX2WC wxMB2WC #define wxWX2WC wxMB2WC
#endif #endif
#else // !wxUSE_UNICODE #else /* !wxUSE_UNICODE */
// No wxUSE_WCHAR_T: we have to do something (JACS) /* No wxUSE_WCHAR_T: we have to do something (JACS) */
#define wxMB2WC wxStrncpy #define wxMB2WC wxStrncpy
#define wxWC2MB wxStrncpy #define wxWC2MB wxStrncpy
#define wxMB2WX wxStrncpy #define wxMB2WX wxStrncpy
@@ -945,5 +951,5 @@ WXDLLIMPEXP_BASE int isascii( int c );
#define wxWX2WC wxMB2WC #define wxWX2WC wxMB2WC
#endif #endif
#endif //_WX_WXCHAR_H_ #endif /* _WX_WXCHAR_H_ */

68
src/regex/regcustom.h
View File

@@ -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,10 +33,10 @@
/* headers if any */ /* headers if any */
// FreeBSD, Watcom and DMars require this, CW doesn't have nor need it. /* 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 /* Others also don't seem to need it. If you have an error related to */
// (not) including <sys/types.h> please report details to /* (not) including <sys/types.h> please report details to */
// wx-dev@lists.wxwindows.org /* wx-dev@lists.wxwindows.org */
#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__) #if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
# include <sys/types.h> # include <sys/types.h>
#endif #endif
@@ -42,23 +45,15 @@
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#include <limits.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 #include "wx/wxchar.h"
# define wx_wchar char
#else // Unicode /**
#if (defined(__GNUC__) && !wxCHECK_GCC_VERSION(2, 96)) *
# define wx_wchar __WCHAR_TYPE__ * wx_wchar == wxChar
#else // __WCHAR_TYPE__ and gcc < 2.96 *
// standard case */
# define wx_wchar wchar_t #define wx_wchar wxChar
#endif // __WCHAR_TYPE__
#endif // ASCII/Unicode
/* overrides for regguts.h definitions, if any */ /* overrides for regguts.h definitions, if any */
#define FUNCPTR(name, args) (*name) args #define FUNCPTR(name, args) (*name) args
@@ -78,36 +73,9 @@ typedef long celt; /* type to hold chr, MCCE number, or
* literal */ * literal */
#define DIGITVAL(c) ((c)-'0') /* turn chr digit into its value */ #define DIGITVAL(c) ((c)-'0') /* turn chr digit into its value */
/* RN - the "not use sizeof() thing is really annoying!" */ #define CHRBITS (SIZEOF_WCHAR_T << 3) /* bits in a chr; must not use sizeof */
#if wxUSE_UNICODE #define CHR_MAX ((1 << CHRBITS) - 1)
# if defined(__WINDOWS__)
# define CHRBITS 16
# define CHR_MAX 0xfffe
# else /* !__WINDOWS__ */
# if defined(__MACH__)
# define CHRBITS 32
# define CHR_MAX 0xfffffffe
# else /* !__MACH__ */
# if !defined(SIZEOF_WCHAR_T)
# define CHRBITS 16
# define CHR_MAX 0xfffe
# else /* defined(SIZEOF_WCHAR_T) */
# define CHRBITS SIZEOF_WCHAR_T
# define CHR_MAX ((1 << CHRBITS) - 1)
# endif /* !defined(SIZEOF_WCHAR_T) */
# endif /* defined(__MACH__) */
# endif /* defined(__WINDOWS__) */
#else /* !wxUSE_UNICODE */
# define CHRBITS 8 /* bits in a chr; must not use sizeof */
# define CHR_MAX 0xfe
#endif /* wxUSE_UNICODE */
#define CHR_MIN 0x00000000 /* smallest and largest chr; the value */ #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 / CHR_MAX-CHR_MIN+1 should fit in uchr */
/* functions operating on chr */ /* functions operating on chr */
@@ -118,3 +86,5 @@ typedef long celt; /* type to hold chr, MCCE number, or
/* and pick up the standard header */ /* and pick up the standard header */
#include "regex.h" #include "regex.h"
#endif /* _REGEX_CUSTOM_H_ */

62
src/regex/regex.dsp
View File

@@ -21,6 +21,8 @@ CFG=regex - Win32 Debug Unicode
!MESSAGE "regex - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "regex - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "regex - Win32 Release Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "regex - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE "regex - Win32 Debug Unicode" (based on "Win32 (x86) Static Library") !MESSAGE "regex - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE "regex - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
!MESSAGE "regex - Win32 Release Unicode With Debug Info" (based on "Win32 (x86) Static Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
@@ -43,7 +45,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c # ADD CPP /nologo /MD /W4 /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG"
@@ -67,7 +69,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /Gm /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -91,7 +93,7 @@ LIB32=link.exe -lib
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c # ADD BASE CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c # ADD CPP /nologo /MD /W4 /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG"
@@ -115,7 +117,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "regex___Win32_Debug_Unicode" # PROP Intermediate_Dir "regex___Win32_Debug_Unicode"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /Gm /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c # ADD BASE CPP /nologo /MDd /Gm /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /Gm /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c # ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -125,6 +127,56 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\regexd.lib" # ADD BASE LIB32 /nologo /out:"..\..\lib\regexd.lib"
# ADD LIB32 /nologo /out:"..\..\lib\regexud.lib" # ADD LIB32 /nologo /out:"..\..\lib\regexud.lib"
!ELSEIF "$(CFG)" == "regex - Win32 Release With Debug Info"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "regex___Win32_Release_With_Debug_Info"
# PROP BASE Intermediate_Dir "regex___Win32_Release_With_Debug_Info"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "regex___Win32_Release_With_Debug_Info"
# PROP Intermediate_Dir "regex___Win32_Release_With_Debug_Info"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /MD /W4 /Zi /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\regex.lib"
# ADD LIB32 /nologo /out:"..\..\lib\regex.lib"
!ELSEIF "$(CFG)" == "regex - Win32 Release Unicode With Debug Info"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "regex___Win32_Release_Unicode_With_Debug_Info"
# PROP BASE Intermediate_Dir "regex___Win32_Release_Unicode_With_Debug_Info"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "regex___Win32_Release_Unicode_With_Debug_Info"
# PROP Intermediate_Dir "regex___Win32_Release_Unicode_With_Debug_Info"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /MD /W4 /Zi /O1 /I "." /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "wxUSE_UNICODE" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\lib\regexu.lib"
# ADD LIB32 /nologo /out:"..\..\lib\regexu.lib"
!ENDIF !ENDIF
# Begin Target # Begin Target
@@ -133,6 +185,8 @@ LIB32=link.exe -lib
# Name "regex - Win32 Debug" # Name "regex - Win32 Debug"
# Name "regex - Win32 Release Unicode" # Name "regex - Win32 Release Unicode"
# Name "regex - Win32 Debug Unicode" # Name "regex - Win32 Debug Unicode"
# Name "regex - Win32 Release With Debug Info"
# Name "regex - Win32 Release Unicode With Debug Info"
# Begin Group "Source Files" # Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

40
src/regex/regex.h
View File

@@ -1,5 +1,6 @@
#ifndef _REGEX_H_ #ifndef _REGEX_H_
#define _REGEX_H_ /* never again */ #define _REGEX_H_ /* never again */
/* /*
* regular expressions * regular expressions
* *
@@ -39,35 +40,26 @@
extern "C" { extern "C" {
#endif #endif
// 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 WXWINDOWS CUSTOM
// (not) including <sys/types.h> please report details to *****************************/
// wx-dev@lists.wxwindows.org #ifndef _REGEX_CUSTOM_H_
#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__) # define wx_wchar wxChar
/* 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> # include <sys/types.h>
#endif # endif
#endif /* ndef _REGEX_CUSTOM_H_ */
/*****************************
END WXWINDOWS CUSTOM
*****************************/
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.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
/* /*
* interface types etc. * interface types etc.
*/ */

109
src/wxWindows.dsp
View File

@@ -27,6 +27,7 @@ CFG=wxWindows - Win32 Debug
!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library") !MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Release Unicode With Debug Info" (based on "Win32 (x86) Static Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
@@ -275,6 +276,31 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib" # ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib"
# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib" # ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode With Debug Info"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
# PROP Intermediate_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /GX /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\lib\wxmswu.lib"
# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
!ENDIF !ENDIF
# Begin Target # Begin Target
@@ -288,6 +314,7 @@ LIB32=link.exe -lib
# Name "wxWindows - Win32 Release" # Name "wxWindows - Win32 Release"
# Name "wxWindows - Win32 Debug" # Name "wxWindows - Win32 Debug"
# Name "wxWindows - Win32 Release With Debug Info" # Name "wxWindows - Win32 Release With Debug Info"
# Name "wxWindows - Win32 Release Unicode With Debug Info"
# Begin Group "Common Files" # Begin Group "Common Files"
# PROP Default_Filter "" # PROP Default_Filter ""
@@ -1677,6 +1704,16 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build # End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode With Debug Info"
# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswu\wx\setup.h
# End Custom Build
!ENDIF !ENDIF
# End Source File # End Source File
@@ -1766,10 +1803,6 @@ SOURCE=..\include\wx\checklst.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\chkconf.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\choicdlg.h SOURCE=..\include\wx\choicdlg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1906,10 +1939,6 @@ SOURCE=..\include\wx\debug.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\defs.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\dialog.h SOURCE=..\include\wx\dialog.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -1994,10 +2023,6 @@ SOURCE=..\include\wx\fdrepdlg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\features.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\ffile.h SOURCE=..\include\wx\ffile.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2374,10 +2399,6 @@ SOURCE=..\include\wx\pen.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\platform.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\popupwin.h SOURCE=..\include\wx\popupwin.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2674,10 +2695,6 @@ SOURCE=..\include\wx\vector.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\version.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\vidmode.h SOURCE=..\include\wx\vidmode.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2718,10 +2735,6 @@ SOURCE=..\include\wx\wx.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\wxchar.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\wxhtml.h SOURCE=..\include\wx\wxhtml.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2818,10 +2831,6 @@ SOURCE=..\include\wx\msw\checklst.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\msw\chkconf.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\msw\choice.h SOURCE=..\include\wx\msw\choice.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -2942,10 +2951,6 @@ SOURCE=..\include\wx\msw\gauge95.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\include\wx\msw\gccpriv.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\msw\gdiimage.h SOURCE=..\include\wx\msw\gdiimage.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@@ -3385,6 +3390,46 @@ SOURCE=..\include\wx\html\m_templ.h
SOURCE=..\include\wx\html\winpars.h SOURCE=..\include\wx\html\winpars.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "C-Only"
# PROP Default_Filter ""
# Begin Group "msw No. 1"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\include\wx\msw\chkconf.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\msw\gccpriv.h
# End Source File
# End Group
# Begin Source File
SOURCE=..\include\wx\chkconf.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\defs.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\features.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\platform.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\version.h
# End Source File
# Begin Source File
SOURCE=..\include\wx\wxchar.h
# End Source File
# End Group
# End Group # End Group
# End Target # End Target
# End Project # End Project