X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/338dd992160bf20205743c092b353d96ef7604fb..3dc0174140ffc52a08fd5b64cf839babad09e5cf:/src/motif/icon.cpp diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp index 17e5b111c1..a31a6f0646 100644 --- a/src/motif/icon.cpp +++ b/src/motif/icon.cpp @@ -27,9 +27,7 @@ #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) -#endif /* * Icons @@ -51,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) @@ -58,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() { }