X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5273bf2fd3292ec3ab3da4f0c197b2f0e93df32e..f1c75e0f93b4ec9f45827cc5a2d16ef17a675dfc:/include/wx/mac/icon.h?ds=sidebyside diff --git a/include/wx/mac/icon.h b/include/wx/mac/icon.h index c128f242aa..88b40740cc 100644 --- a/include/wx/mac/icon.h +++ b/include/wx/mac/icon.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: icon.h // Purpose: wxIcon class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_ICON_H_ #define _WX_ICON_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "icon.h" #endif @@ -21,34 +21,41 @@ // Icon class WXDLLEXPORT wxIcon: public wxBitmap { - DECLARE_DYNAMIC_CLASS(wxIcon) - public: wxIcon(); // Copy constructors - inline wxIcon(const wxIcon& icon) { Ref(icon); } + wxIcon(const wxIcon& icon) + : wxBitmap() + { Ref(icon); } wxIcon(const char **data); wxIcon(char **data); wxIcon(const char bits[], int width , int height ); wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE, - int desiredWidth = -1, int desiredHeight = -1); + int desiredWidth = -1, int desiredHeight = -1); + wxIcon(const wxIconLocation& loc) + { + LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON); + } ~wxIcon(); bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ , int desiredWidth /* = -1 */ , int desiredHeight = -1); bool LoadFile(const wxString& name ,wxBitmapType flags = wxBITMAP_TYPE_ICON_RESOURCE ) - { return LoadFile( name , flags , -1 , -1 ) ; } + { return LoadFile( name , flags , -1 , -1 ) ; } + + wxIcon& operator=(const wxIcon& icon) + { if (this != &icon) Ref(icon); return *this; } + bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; } + bool operator!=(const wxIcon& icon) const { return !(*this == icon); } - inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } - inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; } - inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; } - // 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); + + DECLARE_DYNAMIC_CLASS(wxIcon) }; /* @@ -58,9 +65,9 @@ class WXDLLEXPORT wxICONFileHandler: public wxBitmapHandler public: inline wxICONFileHandler() { - m_name = "ICO icon file"; - m_extension = "ico"; - m_type = wxBITMAP_TYPE_ICO; + m_name = "ICO icon file"; + m_extension = "ico"; + m_type = wxBITMAP_TYPE_ICO; }; virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, @@ -74,9 +81,9 @@ class WXDLLEXPORT wxICONResourceHandler: public wxBitmapHandler public: inline wxICONResourceHandler() { - m_name = "ICON resource"; - m_extension = ""; - m_type = wxBITMAP_TYPE_ICON_RESOURCE; + m_name = wxT("ICON resource"); + m_extension = wxEmptyString; + m_type = wxBITMAP_TYPE_ICON_RESOURCE; }; virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,