X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1bc822dfb5cdc24fd2d98b59ea20c9951301bfb1..a67e6e5438039aee7f0dd37acaea483037c89a62:/src/motif/icon.cpp diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp index 56c10def1c..54edd5f3cb 100644 --- a/src/motif/icon.cpp +++ b/src/motif/icon.cpp @@ -14,24 +14,12 @@ #endif #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) +IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap); -/* -* Icons -*/ +// ============================================================================ +// Icons +// ============================================================================ wxIcon::wxIcon() { @@ -75,9 +63,7 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type, int desiredWidth, int desiredHeight) { UnRef(); - - m_refData = new wxBitmapRefData; - + wxBitmapHandler *handler = FindHandler(type); if ( handler ) @@ -86,4 +72,3 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type, else return FALSE; } -