From: Guillermo Rodriguez Garcia Date: Mon, 6 Mar 2000 17:34:24 +0000 (+0000) Subject: Added wxIcon(const char **) ctor (same as char **) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/425652451b54c6dd036428e755ce24e467a34671?ds=sidebyside Added wxIcon(const char **) ctor (same as char **) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 3ac1eb4450..c79cb7bb11 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -48,6 +48,7 @@ public: wxIcon(const char bits[], int width, int height); // Initialize with XPM data + wxIcon(const char **data); wxIcon(char **data); wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_XPM, diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp index fb9802ebfa..96905576b3 100644 --- a/src/motif/icon.cpp +++ b/src/motif/icon.cpp @@ -49,6 +49,11 @@ wxIcon::wxIcon(char **data) (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); } +wxIcon::wxIcon(const char **data) +{ + (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); +} + wxIcon::wxIcon(const wxString& icon_file, long flags, int desiredWidth, int desiredHeight)