X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f97c985452b20a8c2f0bbfb1d0275298bf09fb45..5b9255698ac3ade7e00e3d5efef95b223e3c9cae:/src/motif/icon.cpp diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp index 0f3ff04a64..96905576b3 100644 --- a/src/motif/icon.cpp +++ b/src/motif/icon.cpp @@ -16,18 +16,22 @@ #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 - */ +* Icons +*/ wxIcon::wxIcon() { @@ -40,14 +44,19 @@ wxIcon::wxIcon(const char bits[], int width, int height) } // Create from XPM data +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) - + int desiredWidth, int desiredHeight) + { LoadFile(icon_file, flags, desiredWidth, desiredHeight); } @@ -57,17 +66,17 @@ wxIcon::~wxIcon() } bool wxIcon::LoadFile(const wxString& filename, long type, - int desiredWidth, int desiredHeight) + int desiredWidth, int desiredHeight) { - UnRef(); - - m_refData = new wxBitmapRefData; - - wxBitmapHandler *handler = FindHandler(type); - - if ( handler ) - return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight); - else - return FALSE; + UnRef(); + + m_refData = new wxBitmapRefData; + + wxBitmapHandler *handler = FindHandler(type); + + if ( handler ) + return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight); + else + return FALSE; }