X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1bc822dfb5cdc24fd2d98b59ea20c9951301bfb1..3cb99894576612e347480d43c5f2e2550b6151cf:/include/wx/motif/icon.h

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index 9d58ceb389..eba9735f4d 100644
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -12,20 +12,15 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "icon.h"
 #endif
 
 #include "wx/bitmap.h"
 
-#define M_ICONDATA ((wxBitmapRefData *)m_refData)
-#define M_ICONHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
-
 // Icon
-class WXDLLEXPORT wxIcon: public wxBitmap
+class WXDLLEXPORT wxIcon : public wxBitmap
 {
-    DECLARE_DYNAMIC_CLASS(wxIcon)
-        
 public:
     wxIcon();
     
@@ -40,23 +35,35 @@ public:
     wxIcon(char **data);
     
     wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
-        int desiredWidth = -1, int desiredHeight = -1);
+           int desiredWidth = -1, int desiredHeight = -1)
+    {
+        LoadFile(name, type, desiredWidth, desiredHeight);
+    }
+
+    wxIcon(const wxIconLocation& loc)
+    {
+        LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY);
+    }
+
     ~wxIcon();
     
     bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
-        int desiredWidth = -1, int desiredHeight = -1);
+                  int desiredWidth = -1, int desiredHeight = -1);
 
     // create from bitmap (which should have a mask unless it's monochrome):
     // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
     
-    inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
-    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)); }
+    wxIcon& operator = (const wxIcon& icon)
+        { if (this != &icon) Ref(icon); return *this; }
+    bool operator == (const wxIcon& icon) const
+        { return m_refData == icon.m_refData; }
+    bool operator != (const wxIcon& icon) const
+        { return !(*this == icon); }
+
+
+    DECLARE_DYNAMIC_CLASS(wxIcon);
 };
 
-#endif
-// _WX_ICON_H_
+#endif // _WX_ICON_H_