X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e933b5bc365e0907a4f0fd15b4c49e4c96c2b59f..11a23db53128bf244a089123b7fd27deb577a889:/src/motif/icon.cpp diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp index b0a0168c51..2b91c78020 100644 --- a/src/motif/icon.cpp +++ b/src/motif/icon.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 17/09/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -30,13 +29,15 @@ 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 **data) +wxIcon::wxIcon(const char* const* data) { (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); }