wxComboBox included (removed dependency on wxUSE_COMBOBOX which was never

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

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index 92eb0eccfc257484d9cbd28fe38c93dc25a02ce8..89f048ab159f0c4814b4713b526cbd26034dda73 100644 (file)
--- 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); }
 
   // 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
 
   // 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);
 
   wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
     int desiredWidth = -1, int desiredHeight = -1);