X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaf7ab431b85d817af39d1a19b6d392ff5bd9379..2388d9b331a37bbab59db42e06bc8a05380fb813:/include/wx/mgl/icon.h diff --git a/include/wx/mgl/icon.h b/include/wx/mgl/icon.h index a555b70552..03d1c437a1 100644 --- a/include/wx/mgl/icon.h +++ b/include/wx/mgl/icon.h @@ -7,14 +7,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __WX_ICON_H__ #define __WX_ICON_H__ -#ifdef __GNUG__ -#pragma interface "icon.h" -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/bitmap.h" @@ -33,7 +28,6 @@ class WXDLLEXPORT wxIcon: public wxBitmap { public: wxIcon() : wxBitmap() {} - wxIcon(const wxIcon& icon); wxIcon(const char **bits, int width=-1, int height=-1); wxIcon(char **bits, int width=-1, int height=-1); @@ -44,11 +38,10 @@ public: wxBitmap(filename, (wxBitmapType)type) {} wxIcon(const wxIconLocation& loc) - : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ICO) + : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY) { } - wxIcon& operator=(const wxIcon& icon); bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; } bool operator!=(const wxIcon& icon) const { return !(*this == icon); }