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

View File

@@ -1,50 +1,52 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/version.h
// Purpose: wxWindows version numbers
// Author: Julian Smart
// Modified by:
// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/* /////////////////////////////////////////////////////////////////////////// */
/* Name: wx/version.h */
/* Purpose: wxWindows version numbers */
/* Author: Julian Smart */
/* Modified by: */
/* Created: 29/01/98 */
/* RCS-ID: $Id$ */
/* Copyright: (c) 1998 Julian Smart */
/* Licence: wxWindows licence */
/* /////////////////////////////////////////////////////////////////////////// */
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
#ifndef _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
// so don't change its format too much or they could break
/* 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 */
#define wxMAJOR_VERSION 2
#define wxMINOR_VERSION 5
#define wxRELEASE_NUMBER 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_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 \
wxMAKE_VERSION_STRING(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER)
#define wxVERSION_NUM_DOT_STRING \
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 wxBETA_NUMBER 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) \
(wxMAJOR_VERSION > (major) || \
(wxMAJOR_VERSION == (major) && wxMINOR_VERSION > (minor)) || \
(wxMAJOR_VERSION == (major) && wxMINOR_VERSION == (minor) && wxRELEASE_NUMBER >= (release)))
#endif // _WX_VERSION_H_
#endif /* _WX_VERSION_H_ */