// headers
// ----------------------------------------------------------------------------
-// compatible (even if incorrect) behaviour by default: derive wxIcon from
-// wxBitmap
-#ifndef wxICON_IS_BITMAP
- #define wxICON_IS_BITMAP 1
-#endif
-
-#if wxICON_IS_BITMAP
- #include "wx/bitmap.h"
-
- #define wxIconRefDataBase wxBitmapRefData
- #define wxIconBase wxBitmap
-#else
- #include "wx/msw/gdiimage.h"
-
- #define wxIconRefDataBase wxGDIImageRefData
- #define wxIconBase wxGDIImage
-#endif
+#include "wx/msw/gdiimage.h"
// ---------------------------------------------------------------------------
// icon data
// notice that although wxIconRefData inherits from wxBitmapRefData, it is not
// a valid wxBitmapRefData
-class WXDLLEXPORT wxIconRefData : public wxIconRefDataBase
+class WXDLLEXPORT wxIconRefData : public wxGDIImageRefData
{
public:
wxIconRefData() { }
// Icon
// ---------------------------------------------------------------------------
-class WXDLLEXPORT wxIcon : public wxIconBase
+class WXDLLEXPORT wxIcon : public wxGDIImage
{
public:
// ctors
bool operator != (const wxIcon& icon) const
{ return m_refData != icon.m_refData; }
+ // implementation only from now on
wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
void SetHICON(WXHICON icon) { SetHandle((WXHANDLE)icon); }
WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
+ // 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);
+
protected:
virtual wxGDIImageRefData *CreateData() const
{
// create from XPM data
void CreateIconFromXpm(const char **data);
- // create from bitmap (which should have a mask unless it's monochrome)
- void CopyFromBitmap(const wxBitmap& bmp);
-
private:
DECLARE_DYNAMIC_CLASS(wxIcon)
};