Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added wxIcon(const char **) ctor (same as char **)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-03-06 17:34:24 +00:00
parent 65dc92ca0f
commit 425652451b
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/motif/icon.h
View File

@@ -48,6 +48,7 @@ public:
wxIcon(const char bits[], int width, int height); wxIcon(const char bits[], int width, int height);
// Initialize with XPM data // Initialize with XPM data
wxIcon(const char **data);
wxIcon(char **data); wxIcon(char **data);
wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_XPM, wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_XPM,

5
src/motif/icon.cpp
View File

@@ -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, wxIcon::wxIcon(const wxString& icon_file, long flags,
int desiredWidth, int desiredHeight) int desiredWidth, int desiredHeight)