X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b7f2165565bb33b149baf1272e28f9a61d579d3..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/msw/icon.h diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index 101671a656..21f8abd6b4 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -12,31 +12,11 @@ #ifndef _WX_ICON_H_ #define _WX_ICON_H_ -#ifdef __GNUG__ - #pragma interface "icon.h" -#endif - // ---------------------------------------------------------------------------- // 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 @@ -44,7 +24,7 @@ // notice that although wxIconRefData inherits from wxBitmapRefData, it is not // a valid wxBitmapRefData -class WXDLLEXPORT wxIconRefData : public wxIconRefDataBase +class WXDLLIMPEXP_CORE wxIconRefData : public wxGDIImageRefData { public: wxIconRefData() { } @@ -57,55 +37,55 @@ public: // Icon // --------------------------------------------------------------------------- -class WXDLLEXPORT wxIcon : public wxIconBase +class WXDLLIMPEXP_CORE wxIcon : public wxGDIImage { public: // ctors // default wxIcon() { } - // copy - wxIcon(const wxIcon& icon) { Ref(icon); } - // from raw data wxIcon(const char bits[], int width, int height); + // from XPM data - wxIcon(const char **data) { CreateIconFromXpm(data); } - wxIcon(char **data) { CreateIconFromXpm((const char **)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, - long type = wxBITMAP_TYPE_ICO_RESOURCE, + wxBitmapType type = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1); + wxIcon(const wxIconLocation& loc); + virtual ~wxIcon(); virtual bool LoadFile(const wxString& name, - long type = wxBITMAP_TYPE_ICO_RESOURCE, + wxBitmapType type = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1); - 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 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 { return new wxIconRefData; } - // create from XPM data - void CreateIconFromXpm(const char **data); + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - // create from bitmap (which should have a mask unless it's monochrome) - void CopyFromBitmap(const wxBitmap& bmp); + // create from XPM data + void CreateIconFromXpm(const char* const* data); private: DECLARE_DYNAMIC_CLASS(wxIcon)