SetTextColour is gone

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

diff --git a/include/wx/mac/classic/icon.h b/include/wx/mac/classic/icon.h
index ca42a7b2422239fa0bf8db0a39c6fb01056b05e2..841fd38810f7c662e8f2e34ca2816cd483bc8f66 100644 (file)
--- a/include/wx/mac/classic/icon.h
+++ b/include/wx/mac/classic/icon.h
@@ -20,11 +20,6 @@ class WXDLLEXPORT wxIcon: public wxBitmap
 public:
   wxIcon();
 
 public:
   wxIcon();
 

-  // Copy constructors
-  wxIcon(const wxIcon& icon)
-      : wxBitmap()
-      { Ref(icon); }
-

   wxIcon(const char **data);
   wxIcon(char **data);
   wxIcon(const char bits[], int width , int height );
   wxIcon(const char **data);
   wxIcon(char **data);
   wxIcon(const char bits[], int width , int height );


@@ -34,15 +29,13 @@ public:
   {
       LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
   }
   {
       LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
   }

-  ~wxIcon();
+  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 ) ; }
 
 
   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); }
 
   bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
   bool operator!=(const wxIcon& icon) const { return !(*this == icon); }