WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords);
+wxXmlResource *wxXmlResource::ms_instance = NULL;
+
+/*static*/ wxXmlResource *wxXmlResource::Get()
+{
+ if ( !ms_instance )
+ ms_instance = new wxXmlResource;
+ return ms_instance;
+}
+
+/*static*/ wxXmlResource *wxXmlResource::Set(wxXmlResource *res)
+{
+ wxXmlResource *old = ms_instance;
+ ms_instance = res;
+ return old;
+}
+
wxXmlResource::wxXmlResource(int flags)
{
m_handlers.DeleteContents(TRUE);
{
#if wxUSE_FILESYSTEM
if (filemask.Lower().Matches(wxT("*.zip")) ||
- filemask.Lower().Matches(wxT("*.rsc")))
+ filemask.Lower().Matches(wxT("*.xrs")))
{
- rt = rt && Load(fnd + wxT("#zip:*.xmb"));
+ rt = rt && Load(fnd + wxT("#zip:*.xmlbin"));
rt = rt && Load(fnd + wxT("#zip:*.xrc"));
}
else
wxFileSystem fsys;
# endif
+ wxString encoding(wxT("UTF-8"));
+#if !wxUSE_UNICODE && wxUSE_INTL
+ if ( (GetFlags() & wxXRC_USE_LOCALE) == 0 )
+ {
+ // In case we are not using wxLocale to translate strings, convert the strings
+ // GUI's charset. This must not be done when wxXRC_USE_LOCALE is on, because
+ // it could break wxGetTranslation lookup.
+ encoding = wxLocale::GetSystemEncodingName();
+ }
+#endif
+
for (size_t i = 0; i < m_data.GetCount(); i++)
{
modif = (m_data[i].Doc == NULL);
if (modif)
{
- wxInputStream *stream = NULL;
+ wxInputStream *stream = NULL;
# if wxUSE_FILESYSTEM
file = fsys.OpenFile(m_data[i].File);
delete m_data[i].Doc;
m_data[i].Doc = new wxXmlDocument;
}
- if (!stream || !m_data[i].Doc->Load(*stream))
+ if (!stream || !m_data[i].Doc->Load(*stream, encoding))
{
- wxLogError(_("Cannot load resources from file '%s'."), m_data[i].File.c_str());
+ wxLogError(_("Cannot load resources from file '%s'."),
+ m_data[i].File.c_str());
wxDELETE(m_data[i].Doc);
}
else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource"))
-wxString wxXmlResourceHandler::GetText(const wxString& param)
+wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
{
- wxString str1;
+ wxString str1(GetParamValue(param));
wxString str2;
const wxChar *dt;
wxChar amp_char;
- if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
- str1 = wxGetTranslation(GetParamValue(param));
- else
- str1 = GetParamValue(param);
-
- // VS: First version of XRC resources used $ instead of & (which is illegal in XML),
- // but later I realized that '_' fits this purpose much better (because
- // &File means "File with F underlined").
+ // VS: First version of XRC resources used $ instead of & (which is
+ // illegal in XML), but later I realized that '_' fits this purpose
+ // much better (because &File means "File with F underlined").
if (m_resource->CompareVersion(2,3,0,1) < 0)
amp_char = wxT('$');
else
else str2 << *dt;
}
- return str2;
+ if (translate && m_resource->GetFlags() & wxXRC_USE_LOCALE)
+ return wxGetTranslation(str2);
+ else
+ return str2;
+
}
stdID(wxID_DEFAULT); stdID(wxID_MORE); stdID(wxID_SETUP);
stdID(wxID_RESET); stdID(wxID_HELP_CONTEXT);
#undef stdID
- else return wxXmlResource::GetXMLID(sid);
+ else return wxXmlResource::GetXRCID(sid);
}
-// --------------- XMLID implementation -----------------------------
+// --------------- XRCID implementation -----------------------------
-#define XMLID_TABLE_SIZE 1024
+#define XRCID_TABLE_SIZE 1024
-struct XMLID_record
+struct XRCID_record
{
int id;
wxChar *key;
- XMLID_record *next;
+ XRCID_record *next;
};
-static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {NULL};
+static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
-/*static*/ int wxXmlResource::GetXMLID(const wxChar *str_id)
+/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
{
- static int XMLID_LastID = wxID_HIGHEST;
+ static int XRCID_LastID = wxID_HIGHEST;
int index = 0;
for (const wxChar *c = str_id; *c != wxT('\0'); c++) index += (int)*c;
- index %= XMLID_TABLE_SIZE;
+ index %= XRCID_TABLE_SIZE;
- XMLID_record *oldrec = NULL;
+ XRCID_record *oldrec = NULL;
int matchcnt = 0;
- for (XMLID_record *rec = XMLID_Records[index]; rec; rec = rec->next)
+ for (XRCID_record *rec = XRCID_Records[index]; rec; rec = rec->next)
{
if (wxStrcmp(rec->key, str_id) == 0)
{
oldrec = rec;
}
- XMLID_record **rec_var = (oldrec == NULL) ?
- &XMLID_Records[index] : &oldrec->next;
- *rec_var = new XMLID_record;
- (*rec_var)->id = ++XMLID_LastID;
+ XRCID_record **rec_var = (oldrec == NULL) ?
+ &XRCID_Records[index] : &oldrec->next;
+ *rec_var = new XRCID_record;
+ (*rec_var)->id = ++XRCID_LastID;
(*rec_var)->key = wxStrdup(str_id);
(*rec_var)->next = NULL;
}
-static void CleanXMLID_Record(XMLID_record *rec)
+static void CleanXRCID_Record(XRCID_record *rec)
{
if (rec)
{
- CleanXMLID_Record(rec->next);
+ CleanXRCID_Record(rec->next);
free(rec->key);
delete rec;
}
}
-static void CleanXMLID_Records()
+static void CleanXRCID_Records()
{
- for (int i = 0; i < XMLID_TABLE_SIZE; i++)
- CleanXMLID_Record(XMLID_Records[i]);
+ for (int i = 0; i < XRCID_TABLE_SIZE; i++)
+ CleanXRCID_Record(XRCID_Records[i]);
}
// --------------- module and globals -----------------------------
-
-static wxXmlResource gs_XmlResource;
-
-wxXmlResource *wxTheXmlResource = &gs_XmlResource;
-
-
class wxXmlResourceModule: public wxModule
{
DECLARE_DYNAMIC_CLASS(wxXmlResourceModule)
public:
wxXmlResourceModule() {}
- bool OnInit() {return TRUE;}
+ bool OnInit()
+ {
+ return TRUE;
+ }
void OnExit()
{
- wxTheXmlResource->ClearHandlers();
- CleanXMLID_Records();
+ delete wxXmlResource::Set(NULL);
+ CleanXRCID_Records();
}
};
projects / wxWidgets.git / blobdiff