// Created: 10/09/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_ICON_H_
// headers
// ----------------------------------------------------------------------------
-// compatible (even if incorrect) behaviour by default: derive wxIcon from
-// wxBitmap
-#ifndef wxICON_IS_BITMAP
- #define wxICON_IS_BITMAP 1
-#endif
-
#include "wx/bitmap.h"
-#if wxICON_IS_BITMAP
+#include "wx/os2/gdiimage.h"
- #define wxIconRefDataBase wxBitmapRefData
- #define wxIconBase wxBitmap
-#else
- #include "wx/os2/gdiimage.h"
-
- #define wxIconRefDataBase wxGDIImageRefData
- #define wxIconBase wxGDIImage
-#endif
+#define wxIconRefDataBase wxGDIImageRefData
+#define wxIconBase wxGDIImage
-class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
+class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase
{
public:
wxIconRefData() { };
// Icon
// ---------------------------------------------------------------------------
-class WXDLLEXPORT wxIcon: public wxIconBase
+class WXDLLIMPEXP_CORE wxIcon: public wxIconBase
{
public:
wxIcon();
- // Copy constructors
- inline wxIcon(const wxIcon& icon) { Ref(icon); }
-
wxIcon( const char bits[]
,int nWidth
,int nHeight
);
- inline wxIcon(const char** ppData) { CreateIconFromXpm(ppData); }
- inline wxIcon(char** ppData) { CreateIconFromXpm((const char**)ppData); }
+ wxIcon(const char* const* ppData) { CreateIconFromXpm(ppData); }
+#ifdef wxNEEDS_CHARPP
+ wxIcon(char** ppData) { CreateIconFromXpm(wx_const_cast(const char* const*, ppData)); }
+#endif
wxIcon( const wxString& rName
- ,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE
+ ,wxBitmapType lFlags = wxICON_DEFAULT_TYPE
,int nDesiredWidth = -1
,int nDesiredHeight = -1
);
LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICO);
}
- ~wxIcon();
+ virtual ~wxIcon();
bool LoadFile( const wxString& rName
- ,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE
+ ,wxBitmapType lFlags = wxICON_DEFAULT_TYPE
,int nDesiredWidth = -1
,int nDesiredHeight = -1
);
- inline wxIcon& operator = (const wxIcon& rIcon)
- { if (*this != rIcon) Ref(rIcon); return *this; }
- inline bool operator == (const wxIcon& rIcon) const
- { return m_refData == rIcon.m_refData; }
- inline bool operator != (const wxIcon& rIcon) const
- { return m_refData != rIcon.m_refData; }
-
wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
{
return new wxIconRefData;
}
- void CreateIconFromXpm(const char **ppData);
+ void CreateIconFromXpm(const char* const* ppData);
private:
bool m_bIsXpm;