ok, putting it back... not everybody has autoheader

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

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index 22c1bda7e578a703f2e6ba577a253ef622b0c7c3..e306018665cc908955ee29cced755523aac85d31 100644 (file)
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/icon.h
@@ -2,10 +2,9 @@
 // Name:        icon.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -36,15 +35,19 @@ class wxIcon: public wxBitmap
 
 public:
 
-  wxIcon(void) {};
+  wxIcon();
+  wxIcon( const wxIcon& icon);
+  wxIcon( const char **bits, int width=-1, int height=-1 );
 
-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
-  inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
+  // For compatibility with wxMSW where desired size is sometimes required to
+  // distinguish between multiple icons in a resource.
+  wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM, int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ):
+    wxBitmap(filename, type)
+  {
+  }
+  wxIcon( char **bits, int width=-1, int height=-1 );
 
-  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; }
 };