apptraits for wxMac classic and carbon

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

diff --git a/include/wx/mac/icon.h b/include/wx/mac/icon.h
index 0993fa43053337e063f55ec0a890a4d1c3720632..88b40740ccb9f6f581a2fd153e2153a634fe211c 100644 (file)
--- a/include/wx/mac/icon.h
+++ b/include/wx/mac/icon.h
@@ -21,8 +21,6 @@
 // Icon
 class WXDLLEXPORT wxIcon: public wxBitmap
 {
-  DECLARE_DYNAMIC_CLASS(wxIcon)
-
 public:
   wxIcon();
 
@@ -35,22 +33,29 @@ public:
   wxIcon(char **data);
   wxIcon(const char bits[], int width , int height );
   wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE,
-    int desiredWidth = -1, int desiredHeight = -1);
+         int desiredWidth = -1, int desiredHeight = -1);
+  wxIcon(const wxIconLocation& loc)
+  {
+      LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
+  }
   ~wxIcon();
 
   bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
       int desiredWidth /* = -1 */ , int desiredHeight = -1);
   bool LoadFile(const wxString& name ,wxBitmapType flags = wxBITMAP_TYPE_ICON_RESOURCE )
-      { return LoadFile( name , flags , -1 , -1 ) ; } 
+      { return LoadFile( name , flags , -1 , -1 ) ; }
+
+  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); }
 
-  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; }
-  
   // 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);
+
+  DECLARE_DYNAMIC_CLASS(wxIcon)
 };
 
 /*