fix building with WXWIN_COMPATIBILITY_2_8 == 0

[wxWidgets.git] / src / xrc / xmlres.cpp

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index a600a58db3798bf7a3c74c16ce2ea06a003574fc..862eabdbab451d94bc29fe45bc2b4c5dd885fa9a 100644 (file)
--- 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