attempts to make wxCondition::Broadcast() and Signal() work simultaneously - currentl...

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

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index 3ac1eb445001ac549ab804f55191525e724c6e65..8042fb8f06c71da9c591c912cbf87295e9072e3b 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 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,
   wxIcon(char **data);
 
   wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_XPM,


@@ -56,12 +57,10 @@ public:
 
   bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_XPM,
       int desiredWidth = -1, int desiredHeight = -1);
 
   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; }
 
   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)); }
 };