X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0794a4ccd8df2fe136f2f0bef96c6e05c29721a..5d0fac27c4b2151b1ff3689cdb602bbaf10a4003:/include/wx/mac/carbon/icon.h?ds=sidebyside

diff --git a/include/wx/mac/carbon/icon.h b/include/wx/mac/carbon/icon.h
index f070bc224c..5e786bca58 100644
--- a/include/wx/mac/carbon/icon.h
+++ b/include/wx/mac/carbon/icon.h
@@ -12,10 +12,6 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "icon.h"
-#endif
-
 #include "wx/bitmap.h"
 
 // Icon
@@ -24,13 +20,6 @@ class WXDLLEXPORT wxIcon: public wxGDIObject
 public:
     wxIcon();
 
-    // Copy constructors
-    wxIcon(const wxIcon& icon)
-        : wxGDIObject()
-    {
-        Ref(icon);
-    }
-
     wxIcon(const char **data);
     wxIcon(char **data);
     wxIcon(const char bits[], int width , int height );
@@ -40,24 +29,24 @@ public:
     {
       LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
     }
-    ~wxIcon();
+
+    wxIcon(WXHICON icon, const wxSize& size);
+
+    virtual ~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 ) ; }
 
-    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); }
 
     // 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);
 
-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
     int GetWidth() const;
     int GetHeight() const;
     int GetDepth() const;