Remove checks for wxNEEDS_CHARPP

wxNEEDS_CHARPP was needed only for now unsupported GCC versions.

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/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/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();
 

src/generic/icon.cpp

@@ -25,13 +25,6 @@ wxIcon::wxIcon(const char* const* bits) :
 {
 }
 
-#ifdef wxNEEDS_CHARPP
-wxIcon::wxIcon(char **bits) :
-    wxBitmap( bits )
-{
-}
-#endif
-
 wxIcon::wxIcon() :  wxBitmap()
 {
 }

src/motif/icon.cpp

@@ -29,14 +29,6 @@ wxIcon::wxIcon(const char bits[], int width, int height)
     (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, 1);
 }
 
-#ifdef wxNEEDS_CHARPP
-// Create from XPM data
-wxIcon::wxIcon(char **data)
-{
-    (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
-}
-#endif
-
 wxIcon::wxIcon(const char* const* data)
 {
     (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);