X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/355b4d3de54b76db87439fa2142c7334a6e48f85..d85aece19960f1c09051d2bd5f54281272fde8ff:/src/motif/icon.cpp diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp index f3904bb57f..eaa688689b 100644 --- a/src/motif/icon.cpp +++ b/src/motif/icon.cpp @@ -14,7 +14,7 @@ #include "wx/icon.h" -IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap); +IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) // ============================================================================ // Icons @@ -30,13 +30,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); }