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