/////////////////////////////////////////////////////////////////////////////
-// Name: icon.h
+// Name: wx/msw/icon.h
// Purpose: wxIcon class
// Author: Julian Smart
// Modified by:
#pragma interface "icon.h"
#endif
-#include "wx/bitmap.h"
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/msw/gdiimage.h"
// ---------------------------------------------------------------------------
// icon data
// ---------------------------------------------------------------------------
-class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
-{
- friend class WXDLLEXPORT wxBitmap;
- friend class WXDLLEXPORT wxIcon;
+// notice that although wxIconRefData inherits from wxBitmapRefData, it is not
+// a valid wxBitmapRefData
+class WXDLLEXPORT wxIconRefData : public wxGDIImageRefData
+{
public:
- wxIconRefData();
- ~wxIconRefData();
+ wxIconRefData() { }
+ virtual ~wxIconRefData() { Free(); }
-public:
- WXHICON m_hIcon;
+ virtual void Free();
};
-#define M_ICONDATA ((wxIconRefData *)m_refData)
-#define M_ICONHANDLERDATA ((wxIconRefData *)bitmap->GetRefData())
-
// ---------------------------------------------------------------------------
// Icon
// ---------------------------------------------------------------------------
-class WXDLLEXPORT wxIcon : public wxBitmap
-{
- DECLARE_DYNAMIC_CLASS(wxIcon)
+class WXDLLEXPORT wxIcon : public wxGDIImage
+{
public:
- wxIcon();
+ // ctors
+ // default
+ wxIcon() { }
- // Copy constructors
+ // copy
wxIcon(const wxIcon& icon) { Ref(icon); }
+ // from raw data
wxIcon(const char bits[], int width, int height);
- wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
+ // from XPM data
+ wxIcon(const char **data) { CreateIconFromXpm(data); }
+ wxIcon(char **data) { CreateIconFromXpm((const char **)data); }
+ // from resource/file
+ wxIcon(const wxString& name,
+ long type = wxBITMAP_TYPE_ICO_RESOURCE,
int desiredWidth = -1, int desiredHeight = -1);
- ~wxIcon();
- bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
- int desiredWidth = -1, int desiredHeight = -1);
+ virtual ~wxIcon();
+
+ virtual bool LoadFile(const wxString& name,
+ long type = wxBITMAP_TYPE_ICO_RESOURCE,
+ int desiredWidth = -1, int desiredHeight = -1);
wxIcon& operator = (const wxIcon& icon)
- { if (*this == icon) return (*this); Ref(icon); return *this; }
+ { 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 m_refData != icon.m_refData; }
- void SetHICON(WXHICON ico);
- WXHICON GetHICON() const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); }
+ // implementation only from now on
+ wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
- bool Ok() const { return (m_refData != NULL && M_ICONDATA->m_hIcon != 0) ; }
+ void SetHICON(WXHICON icon) { SetHandle((WXHANDLE)icon); }
+ WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
- bool FreeResource(bool force = FALSE);
-};
-
-// TODO: Put these in separate, private header
+ // 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);
-class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
-{
-DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
-
-public:
- wxICOFileHandler()
- {
- m_name = "ICO icon file";
- m_extension = "ico";
- m_type = wxBITMAP_TYPE_ICO;
- };
-
- virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth = -1, int desiredHeight = -1);
-};
-
-class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler
-{
-DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
-
-public:
- wxICOResourceHandler()
+protected:
+ virtual wxGDIImageRefData *CreateData() const
{
- m_name = "ICO resource";
- m_extension = "ico";
- m_type = wxBITMAP_TYPE_ICO_RESOURCE;
- };
+ return new wxIconRefData;
+ }
- virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth = -1, int desiredHeight = -1);
+ // create from XPM data
+ void CreateIconFromXpm(const char **data);
+private:
+ DECLARE_DYNAMIC_CLASS(wxIcon)
};
#endif