DnD updates

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

diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index a79e4906efbcd2ae00a4d9305feb91ac715e8cc7..2b54f60c059df2d5f09c8fd8d0e00db67b7e8e3b 100644 (file)
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -2,9 +2,8 @@
 // Name:        icon.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        icon.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -36,13 +35,13 @@ class wxIcon: public wxBitmap
 
 public:
 
 
 public:
 

-  wxIcon(void) {};
-
-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
-  inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
+  wxIcon(void);
+  wxIcon( const wxIcon& icon);
+  wxIcon( const wxIcon* icon);
+  wxIcon( const char **bits, int width=-1, int height=-1 );

   wxIcon( char **bits, int width=-1, int height=-1 );
   wxIcon( char **bits, int width=-1, int height=-1 );

-  
-  inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
+
+  wxIcon& operator = (const wxIcon& icon);

   inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
   inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
 };
   inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
   inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
 };