diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h index 0b98032a73..df215e21f7 100644 --- a/include/wx/generic/icon.h +++ b/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. diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 3d1f249e46..2f17a24e5c 100644 --- a/include/wx/gtk/bitmap.h +++ b/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(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); diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index 49fe05908c..176792f189 100644 --- a/include/wx/gtk1/bitmap.h +++ b/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(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(); diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index f09b9c8a8f..898da902a4 100644 --- a/include/wx/motif/icon.h +++ b/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) diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 61707d8866..4d661ff13c 100644 --- a/include/wx/msw/bitmap.h +++ b/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(data)); - } -#endif // Load a file or resource wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index 60c698ed36..2c89f2597a 100644 --- a/include/wx/msw/icon.h +++ b/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(data)); } -#endif // from resource/file wxIcon(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE, diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index 4e7c418b7c..25808e4e80 100644 --- a/include/wx/x11/bitmap.h +++ b/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(data)); - } -#endif wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); virtual ~wxBitmap(); diff --git a/src/generic/icon.cpp b/src/generic/icon.cpp index 1bec907106..2155b34740 100644 --- a/src/generic/icon.cpp +++ b/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() { } diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp index fb642c5c58..3c19525811 100644 --- a/src/motif/icon.cpp +++ b/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);