Explicit casting/instantiation to resolve ambiguous overload.

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

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index 2b54f60c059df2d5f09c8fd8d0e00db67b7e8e3b..e306018665cc908955ee29cced755523aac85d31 100644 (file)
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/icon.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -35,10 +35,16 @@ class wxIcon: public wxBitmap
 
 public:
 
-  wxIcon(void);
+  wxIcon();
   wxIcon( const wxIcon& icon);
-  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);