Here it comes:

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

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index 7596879cd9de1c27ce8e7513b148276b31b240d5..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
 // 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,9 +35,16 @@ class wxIcon: public wxBitmap
 
 public:
 
 
 public:
 

-  wxIcon(void);
-  wxIcon(const wxIcon& icon);
-  wxIcon(const wxIcon* icon);
+  wxIcon();
+  wxIcon( const wxIcon& icon);
+  wxIcon( const char **bits, int width=-1, int height=-1 );
+
+  // 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& operator = (const wxIcon& icon);
   wxIcon( char **bits, int width=-1, int height=-1 );
 
   wxIcon& operator = (const wxIcon& icon);