X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/480505bc6dd7343998d3a4de4908a14c4f6d1378..a2615ebc22a402b1badb46475f94ab6aa3a64018:/contrib/src/xrc/xmlres.cpp diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp index 2da69a6491..33a33edc34 100644 --- a/contrib/src/xrc/xmlres.cpp +++ b/contrib/src/xrc/xmlres.cpp @@ -331,7 +331,7 @@ void wxXmlResource::UpdateResources() delete m_data[i].Doc; m_data[i].Doc = new wxXmlDocument; } - if (!stream || !m_data[i].Doc->Load(*stream, wxXML_IO_AUTO, encoding)) + if (!stream || !m_data[i].Doc->Load(*stream, encoding)) { wxLogError(_("Cannot load resources from file '%s'."), m_data[i].File.c_str()); @@ -372,9 +372,9 @@ void wxXmlResource::UpdateResources() } -wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent, - const wxString& name, - const wxString& classname, +wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent, + const wxString& name, + const wxString& classname, bool recursive) { wxString dummy; @@ -384,10 +384,10 @@ wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent, // where the resource is most commonly looked for): for (node = parent->GetChildren(); node; node = node->GetNext()) { - if ( node->GetType() == wxXML_ELEMENT_NODE && - (node->GetName() == wxT("object") || + if ( node->GetType() == wxXML_ELEMENT_NODE && + (node->GetName() == wxT("object") || node->GetName() == wxT("object_ref")) && - (!classname || + (!classname || node->GetPropVal(wxT("class"), wxEmptyString) == classname) && node->GetPropVal(wxT("name"), &dummy) && dummy == name ) return node; @@ -396,8 +396,8 @@ wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent, if ( recursive ) for (node = parent->GetChildren(); node; node = node->GetNext()) { - if ( node->GetType() == wxXML_ELEMENT_NODE && - (node->GetName() == wxT("object") || + if ( node->GetType() == wxXML_ELEMENT_NODE && + (node->GetName() == wxT("object") || node->GetName() == wxT("object_ref")) ) { wxXmlNode* found = DoFindResource(node, name, classname, TRUE); @@ -409,7 +409,7 @@ wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent, return NULL; } -wxXmlNode *wxXmlResource::FindResource(const wxString& name, +wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& classname, bool recursive) { @@ -421,7 +421,7 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name, if ( m_data[f].Doc == NULL || m_data[f].Doc->GetRoot() == NULL ) continue; - wxXmlNode* found = DoFindResource(m_data[f].Doc->GetRoot(), + wxXmlNode* found = DoFindResource(m_data[f].Doc->GetRoot(), name, classname, recursive); if ( found ) { @@ -445,7 +445,7 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with) wxXmlProperty *dprop; for (dprop = dest.GetProperties(); dprop; dprop = dprop->GetNext()) { - + if ( dprop->GetName() == prop->GetName() ) { dprop->SetValue(prop->GetValue()); @@ -494,7 +494,7 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx if ( !refNode ) { - wxLogError(_("Referenced object node with ref=\"%s\" not found!"), + wxLogError(_("Referenced object node with ref=\"%s\" not found!"), refName.c_str()); return NULL; } @@ -543,7 +543,7 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent wxWindow *myParentAW = m_parentAsWindow, *myInstanceAW = m_instanceAsWindow; m_instance = instance; - if (!m_instance && node->HasProp(wxT("subclass")) && + if (!m_instance && node->HasProp(wxT("subclass")) && !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING)) { wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString); @@ -551,7 +551,7 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent if (classInfo) m_instance = classInfo->CreateObject(); - + if (!m_instance) { wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"), @@ -631,21 +631,16 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults) -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 @@ -673,8 +668,12 @@ wxString wxXmlResourceHandler::GetText(const wxString& param) } else str2 << *dt; } - - return str2; + + if (translate && m_resource->GetFlags() & wxXRC_USE_LOCALE) + return wxGetTranslation(str2); + else + return str2; + } @@ -713,7 +712,7 @@ int wxXmlResourceHandler::GetID() 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); } @@ -776,7 +775,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size) return wxNullBitmap; } if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y); - return img.ConvertToBitmap(); + return wxBitmap(img); } @@ -1042,32 +1041,32 @@ void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode * -// --------------- 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) { @@ -1077,10 +1076,10 @@ static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {NULL}; 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; @@ -1088,20 +1087,20 @@ static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {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]); } @@ -1125,7 +1124,7 @@ public: void OnExit() { delete wxXmlResource::Set(NULL); - CleanXMLID_Records(); + CleanXRCID_Records(); } };