X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..223255fd444e2de51ee6a967be36dd8b618ecfe8:/include/wx/motif/icon.h diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index c22eb5e562..e2aef577cb 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,8 +24,10 @@ 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, int desiredWidth = -1, int desiredHeight = -1) @@ -55,11 +57,6 @@ public: // ctors, assignment operators...), but it's ok to have such function void CopyFromBitmap(const wxBitmap& bmp); - bool operator == (const wxIcon& icon) const - { return m_refData == icon.m_refData; } - bool operator != (const wxIcon& icon) const - { return !(*this == icon); } - DECLARE_DYNAMIC_CLASS(wxIcon) };