Removed references to DEBUG and WXDEBUG; cured Motif font problem; removed

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

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index 1f5907bb2ab087ff1da09945a3878a62fc0308ea..ee3176956838ea957d4bb9796c81a096c51ac3a8 100644 (file)
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/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,15 +35,12 @@ class wxIcon: public wxBitmap
 
 public:
 
 
 public:
 

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

 
 

-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
-  inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
-
-  wxIcon( char **bits, int width = -1, int height = -1 ) :
-    wxBitmap( bits ) {};
-    
-  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; }
 };