Speed fix for wxGenericDirCtrl, starting to add text input control;

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

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index 92eb0eccfc257484d9cbd28fe38c93dc25a02ce8..d1176761c5ea45f6d57d919e1e2603446bef5ed9 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -43,24 +43,26 @@ 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
   wxIcon(const char **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,
+  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);
       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 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; }
-  inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+  inline bool operator == (const wxIcon& icon) const { return m_refData == icon.m_refData; }
+  inline bool operator != (const wxIcon& icon) const { return m_refData != icon.m_refData; }

 
   virtual bool Ok() const { return ((m_refData != NULL) && (M_ICONDATA->m_ok)); }
 };
 
   virtual bool Ok() const { return ((m_refData != NULL) && (M_ICONDATA->m_ok)); }
 };