fixed arguments to make it wxMSW compatible

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

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index 7bcfd636c209f3d12dee90677d390acb97665a18..22c1bda7e578a703f2e6ba577a253ef622b0c7c3 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, int WXUNUSED(width), int WXUNUSED(height) ) :
+  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; }

diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index 7bcfd636c209f3d12dee90677d390acb97665a18..22c1bda7e578a703f2e6ba577a253ef622b0c7c3 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, int WXUNUSED(width), int WXUNUSED(height) ) :
+  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; }