X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59e034c0343ccbc71f61c03762f73832a62cf532..a7d5151df02bf70a9f6ff1c5c7fd33ab07bf409c:/src/motif/icon.cpp diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp index 54edd5f3cb..b0a0168c51 100644 --- a/src/motif/icon.cpp +++ b/src/motif/icon.cpp @@ -1,21 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// -// 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" -IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap); +IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap) // ============================================================================ // Icons @@ -42,13 +41,6 @@ wxIcon::wxIcon(const char **data) (void) Create((void*) data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0); } -wxIcon::wxIcon(const wxString& icon_file, wxBitmapType type, - int desiredWidth, int desiredHeight) - -{ - LoadFile(icon_file, type, desiredWidth, desiredHeight); -} - void wxIcon::CopyFromBitmap(const wxBitmap& bmp) { wxIcon *icon = (wxIcon*)(&bmp); @@ -65,10 +57,10 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type, UnRef(); wxBitmapHandler *handler = FindHandler(type); - + if ( handler ) return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight); else - return FALSE; + return false; }