X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbea3ec6ae2cd8c8d477c6f04a09ca8a1fa1ab96..b63f9a33301b1cead8b9ccbb16e2f50b0d82bbe9:/include/wx/generic/icon.h diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h index 6d216d56a5..d7b13446b0 100644 --- a/include/wx/generic/icon.h +++ b/include/wx/generic/icon.h @@ -44,7 +44,11 @@ public: bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE, int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1) - { return LoadFile(name, flags); } + { return wxBitmap::LoadFile(name, flags); } + + // unhide the base class version + virtual bool LoadFile(const wxString& name, wxBitmapType flags) + { 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