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 4231ec7e05e2aa30d5ab3ffa135109fcc43dd9a8..c79cb7bb110612d88fa6f884c0ca99d76f95ba88 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -48,13 +48,14 @@ public:
   wxIcon(const char bits[], int width, int height);
 
   // Initialize with XPM data
   wxIcon(const char bits[], int width, int height);
 
   // Initialize with XPM data

+  wxIcon(const char **data);

   wxIcon(char **data);
 
   wxIcon(char **data);
 

-  wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
+  wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_XPM,

     int desiredWidth = -1, int desiredHeight = -1);
   ~wxIcon();
 
     int desiredWidth = -1, int desiredHeight = -1);
   ~wxIcon();
 

-  bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
+  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); }
       int desiredWidth = -1, int desiredHeight = -1);
   bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XBM)
     { return wxBitmap::LoadFile(name, type); }