X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f97a0d599100c2eb6d84ac0480bfc8d3dadc747..38ececd4c399ade4c47ca424eb72dbbd5dda528e:/include/wx/generic/icon.h diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h index bc20e9f175..7a336d37ce 100644 --- a/include/wx/generic/icon.h +++ b/include/wx/generic/icon.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 17/09/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -42,12 +41,13 @@ public: { } - bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE, + bool LoadFile(const wxString& name, wxBitmapType flags, int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) { return wxBitmap::LoadFile(name, flags); } // unhide the base class version - virtual bool LoadFile(const wxString& name, wxBitmapType flags) + virtual bool LoadFile(const wxString& name, + wxBitmapType flags = wxICON_DEFAULT_TYPE) { return wxBitmap::LoadFile(name, flags); } // create from bitmap (which should have a mask unless it's monochrome):