gtkfeatures.h does not exist under gtk+ 1.3.1, #ifndef it out

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

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index 4231ec7e05e2aa30d5ab3ffa135109fcc43dd9a8..d1176761c5ea45f6d57d919e1e2603446bef5ed9 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -48,20 +48,21 @@ 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); }
 
   inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
       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; }
-  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)); }
 };