correct access for virtuals

[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 bdc0ff755f6a2e459f7b4f4b88803561456b6879..8a137f6d18630b76cb5475e6c560d3e5916a3643 100644 (file)
--- a/include/wx/mac/classic/icon.h
+++ b/include/wx/mac/classic/icon.h
@@ -12,10 +12,6 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
 #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
 #include "wx/bitmap.h"
 
 // Icon


@@ -24,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 );


@@ -45,8 +36,6 @@ public:
   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 )
       { 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); }