Remove checks for ancient gcc/MinGW versions.
Don't test for wxUSE_NORLANDER_HEADERS, this is always true since many, many years. Remove tests for gcc version < 3.3, notably 2.95: the minimal supported gcc version is 3.4. Closes #15727. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -119,15 +119,6 @@
|
||||
* disable the settings which don't work for some compilers
|
||||
*/
|
||||
|
||||
#ifndef wxUSE_NORLANDER_HEADERS
|
||||
# if ( defined(__WINE__) ) || \
|
||||
((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
|
||||
# define wxUSE_NORLANDER_HEADERS 1
|
||||
# else
|
||||
# define wxUSE_NORLANDER_HEADERS 0
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* All of the settings below require SEH support (__try/__catch) and can't work
|
||||
* without it.
|
||||
@@ -180,12 +171,6 @@
|
||||
# define wxUSE_DEBUG_NEW_ALWAYS 0
|
||||
#endif /* wxUSE_MFC */
|
||||
|
||||
#if (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)
|
||||
/* GnuWin32 doesn't have appropriate headers for e.g. IUnknown. */
|
||||
# undef wxUSE_DRAG_AND_DROP
|
||||
# define wxUSE_DRAG_AND_DROP 0
|
||||
#endif
|
||||
|
||||
#if !wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
|
||||
# undef wxUSE_CHECKLISTBOX
|
||||
# define wxUSE_CHECKLISTBOX 0
|
||||
|
@@ -65,25 +65,6 @@
|
||||
#define wxCHECK_W32API_VERSION( major, minor ) (0)
|
||||
#endif
|
||||
|
||||
/* Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which
|
||||
are more ms-like (header author is Anders Norlander, hence the name) */
|
||||
#if (defined(__MINGW32__) || defined(__CYGWIN__) || defined(__WINE__)) && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95)))
|
||||
#ifndef wxUSE_NORLANDER_HEADERS
|
||||
#define wxUSE_NORLANDER_HEADERS 1
|
||||
#endif
|
||||
#else
|
||||
#ifndef wxUSE_NORLANDER_HEADERS
|
||||
#define wxUSE_NORLANDER_HEADERS 0
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* "old" GNUWIN32 is the one without Norlander's headers: it lacks the
|
||||
standard Win32 headers and we define the used stuff ourselves for it
|
||||
in wx/msw/gnuwin32/extra.h */
|
||||
#if defined(__GNUC__) && !wxUSE_NORLANDER_HEADERS
|
||||
#define __GNUWIN32_OLD__
|
||||
#endif
|
||||
|
||||
/* Cygwin 1.0 */
|
||||
#if defined(__CYGWIN__) && ((__GNUC__==2) && (__GNUC_MINOR__==9))
|
||||
#define __CYGWIN10__
|
||||
|
@@ -72,7 +72,7 @@ WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
|
||||
// define things missing from some compilers' headers
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#if defined(__WXWINCE__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)
|
||||
#if defined(__WXWINCE__)
|
||||
#ifndef ZeroMemory
|
||||
inline void ZeroMemory(void *buf, size_t len) { memset(buf, 0, len); }
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user