X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f7b34a878bbcb2f71a0c7694e2a3bec51460218..6012f61212b67d510e4a6393272e867a4ceb58c1:/include/wx/mgl/icon.h?ds=sidebyside diff --git a/include/wx/mgl/icon.h b/include/wx/mgl/icon.h index 620ddbb4ec..03d1c437a1 100644 --- a/include/wx/mgl/icon.h +++ b/include/wx/mgl/icon.h @@ -3,18 +3,13 @@ // Purpose: // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // 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,25 +28,28 @@ 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); // For compatibility with wxMSW where desired size is sometimes required to // distinguish between multiple icons in a resource. - wxIcon(const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_ICO_RESOURCE, + wxIcon(const wxString& filename, int type = wxBITMAP_TYPE_ICO_RESOURCE, int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) : - wxBitmap(filename, type) {} - - wxIcon& operator = (const wxIcon& icon); - inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; } - inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; } + wxBitmap(filename, (wxBitmapType)type) {} + + wxIcon(const wxIconLocation& loc) + : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY) + { + } + + bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; } + bool operator!=(const wxIcon& icon) const { return !(*this == icon); } // create from bitmap (which should have a mask unless it's monochrome): // there shouldn't be any implicit bitmap -> icon conversion (i.e. no // ctors, assignment operators...), but it's ok to have such function void CopyFromBitmap(const wxBitmap& bmp); - + private: DECLARE_DYNAMIC_CLASS(wxIcon) };