X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4294b7832a5aed3c1cccc06aecd227d43da8830..0a9f252212bdc4f9eea745a04632748d5544c042:/include/wx/motif/icon.h diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index dcec9a6004..4231ec7e05 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -43,7 +43,6 @@ public: // Copy constructors inline wxIcon(const wxIcon& icon) { Ref(icon); } - inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); } // Initialize with XBM data wxIcon(const char bits[], int width, int height); @@ -57,6 +56,8 @@ public: bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE, int desiredWidth = -1, int desiredHeight = -1); + bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XBM) + { return wxBitmap::LoadFile(name, type); } inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }