Solved problem with wxhInstance name being mangled by MSVC; wxGetInstance is now...

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

diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index 4f0a9b53245d08d2f99ff22be95a458aabeadacd..e306018665cc908955ee29cced755523aac85d31 100644 (file)
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -38,6 +38,13 @@ public:
   wxIcon();
   wxIcon( const wxIcon& icon);
   wxIcon( const char **bits, int width=-1, int height=-1 );
   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);