disabled wxMBConv(wxFONTENCODING_UTF7) test -- it doesn't work under Unix with iconv()

[wxWidgets.git] / include / wx / cocoa / icon.h

diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h
index 79178d01aabe852a92736792c39fd040f912878b..8e4214f31d604a9b3921ce233e7989749f05a3de 100644 (file)
--- a/include/wx/cocoa/icon.h
+++ b/include/wx/cocoa/icon.h
@@ -6,7 +6,7 @@
 // Created:     2003/08/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/08/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_ICON_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_ICON_H__


@@ -24,10 +24,6 @@ class WXDLLEXPORT wxIcon: public wxGDIObject
 public:
     wxIcon();
 
 public:
     wxIcon();
 

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

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


@@ -37,15 +33,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); }


@@ -55,7 +49,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 GetWidth() const;
     int GetHeight() const;
 


@@ -63,4 +58,5 @@ public:
     bool CreateFromXpm(const char **bits);
 };
 
     bool CreateFromXpm(const char **bits);
 };
 

-#endif // _WX_COCOA_ICON_H__
+#endif
+    // _WX_COCOA_ICON_H__