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 3ac1eb445001ac549ab804f55191525e724c6e65..c79cb7bb110612d88fa6f884c0ca99d76f95ba88 100644 (file)
--- 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 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,
   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 fb9802ebfa21d8b886b2dd1c899fb1419f46129b..96905576b3364d0a4eb414ec09ed18a10af92c23 100644 (file)
--- 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);
 }
 
     (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)
                
 wxIcon::wxIcon(const wxString& icon_file, long flags,
                int desiredWidth, int desiredHeight)