wxTheColourDatabase->Find() can fail.

[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 cc90942c702301ed032a2229e825157343d7ef7a..3adb3f7e0df9f1e2bfae8b4505ea1e8b2423b00c 100644 (file)
--- a/include/wx/mac/carbon/icon.h
+++ b/include/wx/mac/carbon/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,10 +20,6 @@ class WXDLLEXPORT wxIcon: public wxGDIObject
 public:
     wxIcon();
 
 public:
     wxIcon();
 

-    // Copy constructors
-    wxIcon(const wxIcon& icon)
-      { 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 );


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


@@ -62,7 +52,7 @@ public:
     void SetHeight(int h);
     void SetDepth(int d);
     void SetOk(bool isOk);
     void SetHeight(int h);
     void SetDepth(int d);
     void SetOk(bool isOk);

-    
+

     WXHICON GetHICON() const ;
 
     DECLARE_DYNAMIC_CLASS(wxIcon)
     WXHICON GetHICON() const ;
 
     DECLARE_DYNAMIC_CLASS(wxIcon)