1.
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:
@@ -68,7 +68,7 @@
|
||||
// Macros which are completely disabled in 'release' mode
|
||||
//
|
||||
// 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
|
||||
whenever one of debugging macros fails (i.e. condition is false in an
|
||||
@@ -122,9 +122,12 @@
|
||||
#define wxASSERT_MSG(x, m)
|
||||
#endif //__WXDEBUG__
|
||||
|
||||
// Use of wxFalse instead of FALSE suppresses compiler warnings about testing
|
||||
// constant expression
|
||||
WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
|
||||
#ifdef __cplusplus
|
||||
// Use of wxFalse instead of FALSE suppresses compiler warnings about testing
|
||||
// constant expression
|
||||
WXDLLIMPEXP_DATA_BASE(extern const bool) wxFalse;
|
||||
#endif
|
||||
|
||||
#define wxAssertFailure wxFalse
|
||||
|
||||
// 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
|
||||
// returns false otherwise
|
||||
#ifdef __WXMAC__
|
||||
extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning();
|
||||
#else // !Mac
|
||||
inline bool wxIsDebuggerRunning() { return false; }
|
||||
#endif // Mac/!Mac
|
||||
#ifdef __cplusplus
|
||||
#ifdef __WXMAC__
|
||||
extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning();
|
||||
#else // !Mac
|
||||
inline bool wxIsDebuggerRunning() { return false; }
|
||||
#endif // Mac/!Mac
|
||||
#endif //__cplusplus
|
||||
|
||||
#endif // _WX_DEBUG_H_
|
||||
|
||||
|
Reference in New Issue
Block a user