X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/329e276aa0f06aef6e1dcde5c197088f4695d449..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/motif/icon.cpp diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp index a31a6f0646..eaa688689b 100644 --- a/src/motif/icon.cpp +++ b/src/motif/icon.cpp @@ -1,37 +1,24 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: icon.cpp +// Name: src/motif/icon.cpp // Purpose: wxIcon class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "icon.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #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" IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) -/* -* Icons -*/ +// ============================================================================ +// Icons +// ============================================================================ wxIcon::wxIcon() { @@ -43,24 +30,19 @@ wxIcon::wxIcon(const char bits[], int width, int height) (void) Create((void*) bits, wxBITMAP_TYPE_XBM_DATA, width, height, 1); } +#ifdef wxNEEDS_CHARPP // Create from XPM data wxIcon::wxIcon(char **data) { (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); } +#endif -wxIcon::wxIcon(const char **data) +wxIcon::wxIcon(const char* const* data) { (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); } -wxIcon::wxIcon(const wxString& icon_file, long flags, - int desiredWidth, int desiredHeight) - -{ - LoadFile(icon_file, flags, desiredWidth, desiredHeight); -} - void wxIcon::CopyFromBitmap(const wxBitmap& bmp) { wxIcon *icon = (wxIcon*)(&bmp); @@ -71,18 +53,16 @@ wxIcon::~wxIcon() { } -bool wxIcon::LoadFile(const wxString& filename, long type, +bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type, int desiredWidth, int desiredHeight) { UnRef(); - - m_refData = new wxBitmapRefData; - + wxBitmapHandler *handler = FindHandler(type); - + if ( handler ) - return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight); + return handler->LoadFile(this, filename, type, + desiredWidth, desiredHeight); else - return FALSE; + return false; } -