(blind) compilation fixes after latest changes

[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 5a3b8d45cbe5f962492f97e479a49c290e543523..5e786bca58beec03f2c780ccc6272b88cd55c094 100644 (file)
--- a/include/wx/mac/carbon/icon.h
+++ b/include/wx/mac/carbon/icon.h
@@ -29,6 +29,9 @@ public:
     {
       LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
     }
     {
       LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
     }

+
+    wxIcon(WXHICON icon, const wxSize& size);
+

     virtual ~wxIcon();
 
     bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
     virtual ~wxIcon();
 
     bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,


@@ -36,15 +39,14 @@ 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 ) ; }
 

-    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);
 
 
     // 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;
     int GetWidth() const;
     int GetHeight() const;
     int GetDepth() const;