#ifndef _WX_ICON_H_
#define _WX_ICON_H_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#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
// notice that although wxIconRefData inherits from wxBitmapRefData, it is not
// a valid wxBitmapRefData
-class WXDLLEXPORT wxIconRefData : public wxIconRefDataBase
+class WXDLLEXPORT wxIconRefData : public wxGDIImageRefData
{
public:
wxIconRefData() { }
// Icon
// ---------------------------------------------------------------------------
-class WXDLLEXPORT wxIcon : public wxIconBase
+class WXDLLEXPORT wxIcon : public wxGDIImage
{
public:
// ctors
// 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); }
+
// from resource/file
wxIcon(const wxString& name,
long type = wxBITMAP_TYPE_ICO_RESOURCE,
int desiredWidth = -1, int desiredHeight = -1);
+ wxIcon(const wxIconLocation& loc);
+
virtual ~wxIcon();
virtual bool LoadFile(const wxString& name,