X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55ccdb93e4ae4b606a4068cb37492c1ec3ed77a6..7737e2fd004685a23b18035545e3ed46515aab8a:/include/wx/motif/icon.h diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 0be2892759..4b9e089fba 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -15,7 +15,7 @@ #include "wx/bitmap.h" // Icon -class WXDLLEXPORT wxIcon : public wxBitmap +class WXDLLIMPEXP_CORE wxIcon : public wxBitmap { public: wxIcon(); @@ -24,10 +24,12 @@ public: wxIcon(const char bits[], int width, int height); // Initialize with XPM data - wxIcon(const char **data); + wxIcon(const char* const* data); +#ifdef wxNEEDS_CHARPP wxIcon(char **data); +#endif - wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM, + wxIcon(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1) { LoadFile(name, type, desiredWidth, desiredHeight); @@ -40,15 +42,8 @@ public: virtual ~wxIcon(); - bool LoadFile(const wxString& name, wxBitmapType type, - int desiredWidth, int desiredHeight = -1); - - // unhide base class LoadFile() - virtual bool LoadFile(const wxString& name, - wxBitmapType type = wxBITMAP_TYPE_XPM) - { - return LoadFile(name, type, -1, -1); - } + bool LoadFile(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE, + int desiredWidth = -1, int desiredHeight = -1); // create from bitmap (which should have a mask unless it's monochrome): // there shouldn't be any implicit bitmap -> icon conversion (i.e. no