#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();
,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
);
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 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;