#ifndef _WX_ICON_H_
#define _WX_ICON_H_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "icon.h"
#endif
#include "wx/bitmap.h"
-#define M_ICONDATA ((wxBitmapRefData *)m_refData)
-#define M_ICONHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
-
// Icon
-class WXDLLEXPORT wxIcon: public wxBitmap
+class WXDLLEXPORT wxIcon : public wxBitmap
{
- DECLARE_DYNAMIC_CLASS(wxIcon)
-
public:
wxIcon();
wxIcon(const char **data);
wxIcon(char **data);
- wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_XPM,
- int desiredWidth = -1, int desiredHeight = -1);
+ wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
+ int desiredWidth = -1, int desiredHeight = -1)
+ {
+ LoadFile(name, type, desiredWidth, desiredHeight);
+ }
+
+ wxIcon(const wxIconLocation& loc)
+ {
+ LoadFile(loc.GetFileName());
+ }
+
~wxIcon();
- bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_XPM,
- int desiredWidth = -1, int desiredHeight = -1);
+ bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
+ int desiredWidth = -1, int desiredHeight = -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);
- inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
- inline bool operator == (const wxIcon& icon) const { return m_refData == icon.m_refData; }
- inline bool operator != (const wxIcon& icon) const { return m_refData != icon.m_refData; }
-
- virtual bool Ok() const { return ((m_refData != NULL) && (M_ICONDATA->m_ok)); }
+ 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); }
+
+
+ DECLARE_DYNAMIC_CLASS(wxIcon);
};
-#endif
-// _WX_ICON_H_
+#endif // _WX_ICON_H_