use wxString argument and not wxChar* in wxHtmlParser::AddText(), for compatibility...

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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 479dbbd138ed7ed1cf6ab7f877325b4566643405..5aeacc477b2bd234fd145134d0f47fffa049b48f 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -29,6 +29,7 @@
     #include "wx/bitmap.h"
     #include "wx/image.h"
     #include "wx/module.h"
+    #include "wx/wxcrtvararg.h"
 #endif
 
 #ifndef __WXWINCE__
@@ -69,35 +70,25 @@ wxXmlResource::wxXmlResource(int flags, const wxString& domain)
 {
     m_flags = flags;
     m_version = -1;
-    m_domain = NULL;
-    if (! domain.empty() )
-        SetDomain(domain);
+    SetDomain(domain);
 }
 
 wxXmlResource::wxXmlResource(const wxString& filemask, int flags, const wxString& domain)
 {
     m_flags = flags;
     m_version = -1;
-    m_domain = NULL;
-    if (! domain.empty() )
-        SetDomain(domain);
+    SetDomain(domain);
     Load(filemask);
 }
 
 wxXmlResource::~wxXmlResource()
 {
-    if (m_domain)
-        free(m_domain);
     ClearHandlers();
 }
 
-void wxXmlResource::SetDomain(const wxChar* domain)
+void wxXmlResource::SetDomain(const wxString& domain)
 {
-    if (m_domain)
-        free(m_domain);
-    m_domain = NULL;
-    if (domain && wxStrlen(domain))
-        m_domain = wxStrdup(domain);
+    m_domain = domain;
 }