Removed the WXUNUSED() from size parameters in wxIcon(filename,width,height)

and added default values of -1,-1 to make it compatible with MSW behaviour.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index edb7ab07fe6f94cdcbb19b9afebe2fff437e22de..57951a4e385cbf40a5730bfa5b7ca553c7d012b9 100644 (file)
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/icon.h
@@ -41,7 +41,7 @@ public:
   inline wxIcon(const wxIcon& icon) { Ref(icon); }
   inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
 
-  wxIcon( char **bits, const int WXUNUSED(width), const int WXUNUSED(height) ) :
+  wxIcon( char **bits, const int width = -1, const int height = -1 ) :
     wxBitmap( bits ) {};
     
   inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }

diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index edb7ab07fe6f94cdcbb19b9afebe2fff437e22de..57951a4e385cbf40a5730bfa5b7ca553c7d012b9 100644 (file)
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -41,7 +41,7 @@ public:
   inline wxIcon(const wxIcon& icon) { Ref(icon); }
   inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
 
-  wxIcon( char **bits, const int WXUNUSED(width), const int WXUNUSED(height) ) :
+  wxIcon( char **bits, const int width = -1, const int height = -1 ) :
     wxBitmap( bits ) {};
     
   inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }