Avoid problems with events that might be sent during creation of controls.

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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 18c84d66645e1108d12fcd89e597a8a4b31ca928..789761a6e1fba0d46785caaad5ea4e56564857fc 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -26,6 +26,7 @@
     #include "wx/frame.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
+    #include "wx/bitmap.h"
 #endif
 
 #ifndef __WXWINCE__
@@ -38,7 +39,6 @@
 #include "wx/tokenzr.h"
 #include "wx/fontenum.h"
 #include "wx/module.h"
-#include "wx/bitmap.h"
 #include "wx/image.h"
 #include "wx/fontmap.h"
 #include "wx/artprov.h"
@@ -643,7 +643,7 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
         }
     }
 
-    if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().Length() )
+    if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().length() )
          dest.SetContent(with.GetContent());
 }