X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3b9c43bbc6bf71b6b618d4e2a71231e9cd431dc..f363cee882672e147340240cf0bb194a68e37833:/src/xrc/xmlres.cpp diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp index a600a58db3..862eabdbab 100644 --- a/src/xrc/xmlres.cpp +++ b/src/xrc/xmlres.cpp @@ -3,7 +3,6 @@ // Purpose: XRC resources // Author: Vaclav Slavik // Created: 2000/03/05 -// RCS-ID: $Id$ // Copyright: (c) 2000 Vaclav Slavik // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -1963,7 +1962,7 @@ wxImageList *wxXmlResourceHandlerImpl::GetImageList(const wxString& param) size = icon.GetSize(); // We use the mask by default. - bool mask = !HasParam(wxS("mask")) || GetBool(wxS("mask")); + bool mask = GetBool(wxS("mask"), true); imagelist = new wxImageList(size.x, size.y, mask); } @@ -2872,8 +2871,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxXmlResourceModule, wxModule) void wxXmlInitResourceModule() { wxModule* module = new wxXmlResourceModule; - module->Init(); wxModule::RegisterModule(module); + wxModule::InitializeModules(); } #endif // wxUSE_XRC