Reworked Frame class

[wxWidgets.git] / include / wx / motif / icon.h

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index cbb4f53c69abe990af27b58798e96414619eac30..c79cb7bb110612d88fa6f884c0ca99d76f95ba88 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -48,6 +48,7 @@ public:
   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_XPM,
@@ -56,8 +57,8 @@ public:
 
   bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_XPM,
       int desiredWidth = -1, int desiredHeight = -1);
-//  bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XBM)
-//    { return wxBitmap::LoadFile(name, type); }
+  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; }