SetTextColour is gone

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

diff --git a/include/wx/mac/carbon/icon.h b/include/wx/mac/carbon/icon.h
index 64bdcc74ff8ba089dee958fa6d5b20ad1a43b0b8..34fe306a7eb0c0771cfd5e74a82992adc485c800 100644 (file)
--- a/include/wx/mac/carbon/icon.h
+++ b/include/wx/mac/carbon/icon.h
@@ -20,13 +20,6 @@ class WXDLLEXPORT wxIcon: public wxGDIObject
 public:
     wxIcon();
 
 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 );
     wxIcon(const char **data);
     wxIcon(char **data);
     wxIcon(const char bits[], int width , int height );


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


@@ -53,7 +44,8 @@ public:
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 
     // 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;
     int GetWidth() const;
     int GetHeight() const;
     int GetDepth() const;