X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59e034c0343ccbc71f61c03762f73832a62cf532..9bb50fd0b04c824fc7ba14c0dc4ba4a2a9a1e6ad:/src/motif/icon.cpp diff --git a/src/motif/icon.cpp b/src/motif/icon.cpp index 54edd5f3cb..b1a4a57d6b 100644 --- a/src/motif/icon.cpp +++ b/src/motif/icon.cpp @@ -9,10 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #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); @@ -42,13 +45,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); @@ -70,5 +66,5 @@ bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type, return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight); else - return FALSE; + return false; }