Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxString for wxXmlResource::Set/GetDomain(), it's simpler

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-03-26 21:07:36 +00:00
parent 31b7522e2b
commit d7a80cf5cd
2 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/xrc/xmlres.h
View File

@@ -249,9 +249,10 @@ public:
// Set flags after construction.
void SetFlags(int flags) { m_flags = flags; }
// Get/Set the domain to be passed to the translation functions, defaults to NULL.
wxChar* GetDomain() const { return m_domain; }
void SetDomain(const wxChar* domain);
// Get/Set the domain to be passed to the translation functions, defaults
// to empty string (no domain).
const wxString& GetDomain() const { return m_domain; }
void SetDomain(const wxString& domain);
protected:
// Scans the resources list for unloaded files and loads them. Also reloads
@@ -293,7 +294,7 @@ private:
#endif
// domain to pass to translation functions, if any.
wxChar* m_domain;
wxString m_domain;
friend class wxXmlResourceHandler;
friend class wxXmlResourceModule;

14
src/xrc/xmlres.cpp
View File

@@ -69,8 +69,6 @@ wxXmlResource::wxXmlResource(int flags, const wxString& domain)
{
m_flags = flags;
m_version = -1;
m_domain = NULL;
if (! domain.empty() )
SetDomain(domain);
}
@@ -78,26 +76,18 @@ wxXmlResource::wxXmlResource(const wxString& filemask, int flags, const wxString
{
m_flags = flags;
m_version = -1;
m_domain = NULL;
if (! domain.empty() )
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;
}