X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbea3ec6ae2cd8c8d477c6f04a09ca8a1fa1ab96..ef57807f2789ef9495912bd323541b85b9f0d51e:/include/wx/generic/icon.h diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h index 6d216d56a5..3a1f5072ac 100644 --- a/include/wx/generic/icon.h +++ b/include/wx/generic/icon.h @@ -42,9 +42,14 @@ public: { } - bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE, - int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1) - { return LoadFile(name, flags); } + 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 = wxICON_DEFAULT_TYPE) + { return wxBitmap::LoadFile(name, flags); } // create from bitmap (which should have a mask unless it's monochrome): // there shouldn't be any implicit bitmap -> icon conversion (i.e. no