X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c793fa87560be70db04634202453bbf3ba114535..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/msw/icon.h diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index e331678228..21f8abd6b4 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: icon.h +// Name: wx/msw/icon.h // Purpose: wxIcon class // Author: Julian Smart // Modified by: @@ -12,100 +12,83 @@ #ifndef _WX_ICON_H_ #define _WX_ICON_H_ -#ifdef __GNUG__ - #pragma interface "icon.h" -#endif +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- -#include "wx/bitmap.h" +#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 WXDLLIMPEXP_CORE 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 WXDLLIMPEXP_CORE wxIcon : public wxGDIImage +{ public: - wxIcon(); - - // Copy constructors - wxIcon(const wxIcon& icon) { Ref(icon); } + // ctors + // default + wxIcon() { } + // 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* const* data) { CreateIconFromXpm(data); } +#ifdef wxNEEDS_CHARPP + wxIcon(char **data) { CreateIconFromXpm(const_cast(data)); } +#endif + // from resource/file + wxIcon(const wxString& name, + wxBitmapType type = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1); - ~wxIcon(); - bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE, - int desiredWidth = -1, int desiredHeight = -1); + wxIcon(const wxIconLocation& loc); - wxIcon& operator = (const wxIcon& icon) - { if (*this == icon) return (*this); 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; } + virtual ~wxIcon(); - void SetHICON(WXHICON ico); - WXHICON GetHICON() const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); } + virtual bool LoadFile(const wxString& name, + wxBitmapType type = wxICON_DEFAULT_TYPE, + int desiredWidth = -1, int desiredHeight = -1); - bool Ok() const { return (m_refData != NULL && M_ICONDATA->m_hIcon != 0) ; } + // implementation only from now on + wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; } - bool FreeResource(bool force = FALSE); -}; + void SetHICON(WXHICON icon) { SetHandle((WXHANDLE)icon); } + WXHICON GetHICON() const { return (WXHICON)GetHandle(); } -// 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() +protected: + virtual wxGDIImageRefData *CreateData() const { - 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); -}; + return new wxIconRefData; + } -class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler -{ -DECLARE_DYNAMIC_CLASS(wxICOResourceHandler) - -public: - wxICOResourceHandler() - { - m_name = "ICO resource"; - m_extension = "ico"; - m_type = wxBITMAP_TYPE_ICO_RESOURCE; - }; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth = -1, int desiredHeight = -1); + // create from XPM data + void CreateIconFromXpm(const char* const* data); +private: + DECLARE_DYNAMIC_CLASS(wxIcon) }; #endif