use wxString for wxXmlResource::Set/GetDomain(), it's simpler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -69,35 +69,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;
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user