X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3399051ee9fa4dfa5fa7ac2dd9034062f4414d64..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/motif/icon.h?ds=sidebyside

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index ec4b1a4050..efadb28ba1 100644
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -1,59 +1,62 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        icon.h
+// Name:        wx/motif/icon.h
 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "icon.h"
-#endif
-
 #include "wx/bitmap.h"
 
 // Icon
-class WXDLLEXPORT wxIcon: public wxBitmap
+class WXDLLIMPEXP_CORE wxIcon : public wxBitmap
 {
-    DECLARE_DYNAMIC_CLASS(wxIcon);
-        
 public:
     wxIcon();
-    
-    // Copy constructors
-    inline wxIcon(const wxIcon& icon) { Ref(icon); }
-    
+
     // Initialize with XBM data
     wxIcon(const char bits[], int width, int height);
-    
+
     // Initialize with XPM data
-    wxIcon(const char **data);
+    wxIcon(const char* const* data);
+#ifdef wxNEEDS_CHARPP
     wxIcon(char **data);
-    
-    wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
-        int desiredWidth = -1, int desiredHeight = -1);
-    ~wxIcon();
-    
-    bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
-        int desiredWidth = -1, int desiredHeight = -1);
+#endif
+
+    wxIcon(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE,
+           int desiredWidth = -1, int desiredHeight = -1)
+    {
+        LoadFile(name, type, desiredWidth, desiredHeight);
+    }
+
+    wxIcon(const wxIconLocation& loc)
+    {
+        LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY);
+    }
+
+    virtual ~wxIcon();
+
+    bool LoadFile(const wxString& name, wxBitmapType type,
+                  int desiredWidth, int desiredHeight);
+
+    // unhide the base class version
+    virtual bool LoadFile(const wxString& name,
+                          wxBitmapType flags = wxICON_DEFAULT_TYPE)
+        { return LoadFile(name, flags); }
 
     // 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; }
+
+
+    DECLARE_DYNAMIC_CLASS(wxIcon)
 };
 
 #endif // _WX_ICON_H_