Merge branch 'remove-outdated-gcc-checks'

Remove vestiges of support for gcc < 4 and related checks.

See https://github.com/wxWidgets/wxWidgets/pull/2096

include/wx/cpp.h

@@ -140,20 +140,6 @@
 
 #ifdef HAVE_VARIADIC_MACROS
 
-/*
-   This is a hack to make it possible to use variadic macros with g++ 3.x even
-   when using -pedantic[-errors] option: without this, it would complain that
-
-       "anonymous variadic macros were introduced in C99"
-
-   and the option disabling this warning (-Wno-variadic-macros) is only
-   available in gcc 4.0 and later, so until then this hack is the only thing we
-   can do.
- */
-#if defined(__GNUC__) && __GNUC__ == 3
-    #pragma GCC system_header
-#endif /* gcc-3.x */
-
 /*
    wxCALL_FOR_EACH(what, ...) calls the macro from its first argument, what(pos, x),
    for every remaining argument 'x', with 'pos' being its 1-based index in

include/wx/generic/icon.h

@@ -23,9 +23,6 @@ public:
     wxIcon();
 
     wxIcon(const char* const* bits);
-#ifdef wxNEEDS_CHARPP
-    wxIcon(char **bits);
-#endif
 
     // For compatibility with wxMSW where desired size is sometimes required to
     // distinguish between multiple icons in a resource.

include/wx/gtk/bitmap.h

@@ -72,11 +72,6 @@ public:
         { Create(sz, depth); }
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( const char* const* bits );
-#ifdef wxNEEDS_CHARPP
-    // needed for old GCC
-    wxBitmap(char** data)
-        { *this = wxBitmap(const_cast<const char* const*>(data)); }
-#endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
 #if wxUSE_IMAGE
     wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH, double scale = 1.0);

include/wx/gtk1/bitmap.h

@@ -70,13 +70,6 @@ public:
     wxBitmap( const wxSize& sz, int depth = -1 ) { Create( sz, depth ); }
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( const char* const* bits );
-#ifdef wxNEEDS_CHARPP
-    // needed for old GCC
-    wxBitmap(char** data)
-    {
-        *this = wxBitmap(const_cast<const char* const*>(data));
-    }
-#endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
     wxBitmap( const wxImage& image, int depth = -1, double WXUNUSED(scale) = 1.0 ) { (void)CreateFromImage(image, depth); }
     virtual ~wxBitmap();

include/wx/motif/icon.h

@@ -24,9 +24,6 @@ public:
 
     // Initialize with XPM data
     wxIcon(const char* const* data);
-#ifdef wxNEEDS_CHARPP
-    wxIcon(char **data);
-#endif
 
     wxIcon(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE,
            int desiredWidth = -1, int desiredHeight = -1)

include/wx/msw/bitmap.h

@@ -55,12 +55,6 @@ public:
 
     // Initialize with XPM data
     wxBitmap(const char* const* data);
-#ifdef wxNEEDS_CHARPP
-    wxBitmap(char** data)
-    {
-        *this = wxBitmap(const_cast<const char* const*>(data));
-    }
-#endif
 
     // Load a file or resource
     wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);

include/wx/msw/gccpriv.h

@@ -72,20 +72,8 @@
     #define wxCHECK_MINGW32_VERSION( major, minor ) (0)
 #endif
 
-#if defined( __MINGW32__ ) && !defined(__WINE__) && !defined( HAVE_W32API_H )
-    #if __MINGW32_MAJOR_VERSION >= 1
-        #define HAVE_W32API_H
-    #endif
-#elif defined( __CYGWIN__ ) && !defined( HAVE_W32API_H )
-    #if ( __GNUC__ > 2 )
-        #define HAVE_W32API_H
-    #endif
-#endif
-
 /* check for MinGW/Cygwin w32api version ( releases >= 0.5, only ) */
-#if defined( HAVE_W32API_H )
 #include <w32api.h>
-#endif
 
 #if defined(__W32API_MAJOR_VERSION) && defined(__W32API_MINOR_VERSION)
     #define wxCHECK_W32API_VERSION( major, minor ) \

include/wx/msw/icon.h

@@ -48,9 +48,6 @@ public:
 
         // from XPM data
     wxIcon(const char* const* data) { CreateIconFromXpm(data); }
-#ifdef wxNEEDS_CHARPP
-    wxIcon(char **data) { CreateIconFromXpm(const_cast<const char* const*>(data)); }
-#endif
         // from resource/file
     wxIcon(const wxString& name,
            wxBitmapType type = wxICON_DEFAULT_TYPE,

include/wx/osx/config_xcode.h

@@ -22,7 +22,6 @@
 #define wx_USE_NANOX 0
 
 #define HAVE_VA_COPY 1
-#define HAVE_VARIADIC_MACROS 1
 #define HAVE_STD_WSTRING 1
 #if __GNUC__ > 4 || (  __GNUC__ == 4 && __GNUC_MINOR__ >= 2 )
   #if !defined(__has_include)

include/wx/platform.h

@@ -332,10 +332,6 @@
 #   include "wx/msw/libraries.h"
 #endif
 
-#if (defined(__GNUC__) && __GNUC__ < 3)
-#define wxNEEDS_CHARPP
-#endif
-
 /*
     Note that wx/msw/gccpriv.h must be included after defining UNICODE and
     _UNICODE macros as it includes _mingw.h which relies on them being set.

include/wx/testing.h

@@ -503,11 +503,6 @@ private:
  */
 #ifdef HAVE_VARIADIC_MACROS
 
-// See wx/cpp.h for the explanations of this hack.
-#if defined(__GNUC__) && __GNUC__ == 3
-    #pragma GCC system_header
-#endif /* gcc-3.x */
-
 #define wxTEST_DIALOG(codeToRun, ...)                                          \
     {                                                                          \
         wxTEST_DIALOG_HOOK_CLASS wx_hook(__FILE__, __LINE__, __WXFUNCTION__);  \

include/wx/x11/bitmap.h

@@ -72,13 +72,6 @@ public:
 
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( const char* const* bits );
-#ifdef wxNEEDS_CHARPP
-    // needed for old GCC
-    wxBitmap(char** data)
-    {
-        *this = wxBitmap(const_cast<const char* const*>(data));
-    }
-#endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
     virtual ~wxBitmap();