API adaptions to MSW EnhMetafile

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

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index ec4b1a4050cdee94c850a361c8a5068c8cad805c..eba9735f4d6a570713b6b63fdaf45e40681b7faa 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -12,17 +12,15 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "icon.h"
 #endif
 
 #include "wx/bitmap.h"
 
 // Icon
 #pragma interface "icon.h"
 #endif
 
 #include "wx/bitmap.h"
 
 // Icon

-class WXDLLEXPORT wxIcon: public wxBitmap
+class WXDLLEXPORT wxIcon : public wxBitmap

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxIcon);
-        

 public:
     wxIcon();
     
 public:
     wxIcon();
     


@@ -37,23 +35,35 @@ public:
     wxIcon(char **data);
     
     wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
     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,
     ~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);
     
 
     // 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
+    wxIcon& operator = (const wxIcon& icon)
+        { if (this != &icon) Ref(icon); return *this; }
+    bool operator == (const wxIcon& icon) const

         { return m_refData == icon.m_refData; }
         { return m_refData == icon.m_refData; }

-    inline 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_