// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKICONH__
#define __GTKICONH__
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface
#endif
class wxIcon: public wxBitmap
{
- DECLARE_DYNAMIC_CLASS(wxIcon)
-
public:
+ wxIcon();
+ wxIcon( const wxIcon& icon);
+ wxIcon( const 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, int type = wxBITMAP_TYPE_XPM,
+ int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
+ wxBitmap(filename, type)
+ {
+ }
+ wxIcon( char **bits, int width=-1, int height=-1 );
+
+ wxIcon(const wxIconLocation& loc)
+ : 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); }
- wxIcon(void);
- wxIcon(const wxIcon& icon);
- wxIcon(const wxIcon* icon);
- wxIcon( char **bits, int width=-1, int height=-1 );
+ // 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);
- 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; }
+private:
+ DECLARE_DYNAMIC_CLASS(wxIcon)
};