X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4900c039547a9bed9db0cc88ab9cc678bd2dbc1a..0a976765870f164048378a054af1b8904f2ecdb1:/include/wx/setup.h diff --git a/include/wx/setup.h b/include/wx/setup.h index 8f4372749a..de71dae16b 100644 --- a/include/wx/setup.h +++ b/include/wx/setup.h @@ -16,9 +16,8 @@ #endif #ifdef __VMS -#include "[--]setup.h" -#elif -#if defined(__WXMSW__) +#include "wx_root:[wxwindows]setup.h" +#elif defined(__WXMSW__) #include "wx/msw/setup.h" #elif defined(__WXMAC__) #include "wx/mac/setup.h" @@ -33,47 +32,6 @@ #elif defined(__WXGTK__) #include "wx/gtk/setup.h" #endif -#endif - -/* - * Compatibility defines: note that, in general, there is a a reason for not - * compatible changes, so you should try to avoid defining WXWIN_COMPATIBILITY - * and do so only if your program really can't be compiled otherwise. - */ - -/* - * Compatibility with 1.66 API. - * Level 0: no backward compatibility, all new features - * Level 1: wxDC, OnSize (etc.) compatibility, but - * some new features such as event tables - */ -#define WXWIN_COMPATIBILITY 0 - -/* - * wxWindows 2.0 API compatibility. Possible values are: - * 0: no backwards compatibility - * 1: some backwards compatibility, but if it conflicts with the new - * features, use the new code, not the old one - * 2: maximum backwards compatiblity: even if compatibility can only be - * achieved by disabling new features, do it. - */ -#define WXWIN_COMPATIBILITY_2 1 - -/* - * wxWindows 2.0 uses long for wxPoint/wxRect/wxSize member fields and wxDC - * method arguments, wxWindows 2.1 and later uses wxCoord typedef which is - * usually int. Using long leads to (justified) warnings about long to int - * conversions from some compilers and is, generally speaking, unneeded. - */ -#define wxUSE_COMPATIBLE_COORD_TYPES 0 - -/* - * Maximum compatibility with 2.0 API - */ -#if WXWIN_COMPATIBILITY_2 == 2 -#undef wxUSE_COMPATIBLE_COORD_TYPES -#define wxUSE_COMPATIBLE_COORD_TYPES 1 -#endif /* WXWIN_COMPATIBILITY_2_MAX */ #endif /* _WX_SETUP_H_BASE_ */