AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added WXWIN_COMPATIBILITY_2_2 option (disabled by default)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-07-02 09:23:59 +00:00
parent 8168de4c79
commit 54276ccf5b
4 changed files with 785 additions and 654 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1403
configure vendored
View File

File diff suppressed because it is too large Load Diff

13
configure.in
View File

@ -991,6 +991,9 @@ WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without exce
WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS)
WX_ARG_ENABLE(compat20, [ --enable-compat20 enable wxWin 2.0 compatibility], WXWIN_COMPATIBILITY_2)
WX_ARG_ENABLE(compat22, [ --enable-compat22 enable wxWin 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
dnl ---------------------------------------------------------------------------
dnl (small) optional non GUI classes
dnl ---------------------------------------------------------------------------
@ -3134,6 +3137,16 @@ else
fi
fi
if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
AC_DEFINE(WXWIN_COMPATIBILITY_2)
WXWIN_COMPATIBILITY_2_2="yes"
fi
if test "$WXWIN_COMPATIBILITY_2_2" = "yes"; then
AC_DEFINE(WXWIN_COMPATIBILITY_2_2)
fi
dnl ---------------------------------------------------------------------------
dnl Optional libraries
dnl ---------------------------------------------------------------------------

16
include/wx/msw/setup0.h
View File

@ -36,6 +36,22 @@
// so there is little advantage to setting it to 1.
#define WXWIN_COMPATIBILITY 0
// This setting determines the compatibility with 2.0 API: set it to 1 to
// enable it
//
// Default is 0.
//
// Recommended setting: 0 (please update your code instead!)
#define WXWIN_COMPATIBILITY_2 0
// This setting determines the compatibility with 2.0 API: set it to 1 to
// enable it
//
// Default is 0.
//
// Recommended setting: 0 (please update your code instead!)
#define WXWIN_COMPATIBILITY_2_2 0
// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
// but this is very dangerous because you can mistakenly pass an icon instead
// of a bitmap to a function taking "const wxBitmap&" - which will *not* work

7
setup.h.in
View File

@ -91,7 +91,6 @@
#undef __ULTRIX__
#undef __DATA_GENERAL__
#undef __EMX__
#undef _GNU_SOURCE
/* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
#ifndef __WINDOWS__
@ -659,7 +658,11 @@
/*
* Compatibility with 2.0 API.
*/
#define WXWIN_COMPATIBILITY_2 1
#define WXWIN_COMPATIBILITY_2 0
/*
* Compatibility with 2.2 API
*/
#define WXWIN_COMPATIBILITY_2_2 0
/*
* Enables debugging: memory tracing, assert, etc., contains debug level
*/