X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f97c985452b20a8c2f0bbfb1d0275298bf09fb45..03ab016d6692ccceafb0f324a063bbf8f334f020:/include/wx/motif/icon.h

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index 92eb0eccfc..4231ec7e05 100644
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -43,13 +43,12 @@ 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);
 
   // Initialize with XPM data
-  wxIcon(const char **data);
+  wxIcon(char **data);
 
   wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
     int desiredWidth = -1, int desiredHeight = -1);
@@ -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; }