#include "wx/intl.h"
#include "wx/log.h"
#include "wx/panel.h"
+ #include "wx/frame.h"
+ #include "wx/dialog.h"
+ #include "wx/settings.h"
+ #include "wx/bitmap.h"
+ #include "wx/image.h"
+ #include "wx/module.h"
#endif
#ifndef __WXWINCE__
#include <locale.h>
#endif
-#include "wx/dialog.h"
-#include "wx/frame.h"
#include "wx/wfstream.h"
#include "wx/filesys.h"
#include "wx/filename.h"
#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"
-#include "wx/settings.h"
#include "wx/xml/xml.h"
return old;
}
-wxXmlResource::wxXmlResource(int flags)
+wxXmlResource::wxXmlResource(int flags, const wxString& domain)
{
m_flags = flags;
m_version = -1;
+ m_domain = NULL;
+ if (! domain.empty() )
+ SetDomain(domain);
}
-wxXmlResource::wxXmlResource(const wxString& filemask, int flags)
+wxXmlResource::wxXmlResource(const wxString& filemask, int flags, const wxString& domain)
{
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)
+{
+ if (m_domain)
+ free(m_domain);
+ m_domain = NULL;
+ if (domain && wxStrlen(domain))
+ m_domain = wxStrdup(domain);
+}
+
/* static */
wxString wxXmlResource::ConvertFileNameToURL(const wxString& filename)
}
}
- if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().Length() )
+ if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().length() )
dest.SetContent(with.GetContent());
}
if (translate && parNode &&
parNode->GetPropVal(wxT("translate"), wxEmptyString) != wxT("0"))
{
- return wxGetTranslation(str2);
+ return wxGetTranslation(str2, m_resource->GetDomain());
}
else
{
return wxNullColour;
}
-wxColour wxXmlResourceHandler::GetColour(const wxString& param)
+wxColour wxXmlResourceHandler::GetColour(const wxString& param, const wxColour& defaultv)
{
wxString v = GetParamValue(param);
+
+ if ( v.empty() )
+ return defaultv;
+
wxColour clr;
// wxString -> wxColour conversion
}
+
+bool wxXmlResourceHandler::IsOfClass(wxXmlNode *node, const wxString& classname)
+{
+ return node->GetPropVal(wxT("class"), wxEmptyString) == classname;
+}
+
+
+
wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
{
wxXmlNode *n = node;
if (hasFacename)
{
wxString faces = GetParamValue(wxT("face"));
- wxFontEnumerator enu;
- enu.EnumerateFacenames();
+ wxArrayString facenames(wxFontEnumerator::GetFacenames());
wxStringTokenizer tk(faces, wxT(","));
while (tk.HasMoreTokens())
{
- int index = enu.GetFacenames()->Index(tk.GetNextToken(), false);
+ int index = facenames.Index(tk.GetNextToken(), false);
if (index != wxNOT_FOUND)
{
- facename = (*enu.GetFacenames())[index];
+ facename = facenames[index];
break;
}
}
static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
-static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
+static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = wxID_NONE)
{
int index = 0;
(*rec_var)->next = NULL;
wxChar *end;
- if (value_if_not_found != -2)
+ if (value_if_not_found != wxID_NONE)
(*rec_var)->id = value_if_not_found;
else
{
static void AddStdXRCID_Records();
-/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
+/*static*/
+int wxXmlResource::GetXRCID(const wxChar *str_id, int value_if_not_found)
{
static bool s_stdIDsAdded = false;
AddStdXRCID_Records();
}
- return XRCID_Lookup(str_id);
+ return XRCID_Lookup(str_id, value_if_not_found);
}
stdID(wxID_HELP);
stdID(wxID_PRINT);
stdID(wxID_PRINT_SETUP);
+ stdID(wxID_PAGE_SETUP);
stdID(wxID_PREVIEW);
stdID(wxID_ABOUT);
stdID(wxID_HELP_CONTENTS);