X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d120f8391920145647ec10e84629bc21fa9f1bb..19e30148e18cc99296b26503c155e5cef59045f4:/src/motif/icon.cpp diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp index 55d70fdd9a..a31a6f0646 100644 --- a/src/motif/icon.cpp +++ b/src/motif/icon.cpp @@ -16,14 +16,18 @@ #include "wx/icon.h" #include "wx/window.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) -#endif /* * Icons @@ -45,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) @@ -52,6 +61,12 @@ wxIcon::wxIcon(const wxString& icon_file, long flags, LoadFile(icon_file, flags, desiredWidth, desiredHeight); } +void wxIcon::CopyFromBitmap(const wxBitmap& bmp) +{ + wxIcon *icon = (wxIcon*)(&bmp); + *this = *icon; +} + wxIcon::~wxIcon() { }