X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f2eabd59d7e448410d543ddc303b36836daa5ae..8262f9aecb42cefb62a6c574812a2db3dcc33661:/contrib/src/xrc/xmlres.cpp diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp index 93a0b7f561..8a630df247 100644 --- a/contrib/src/xrc/xmlres.cpp +++ b/contrib/src/xrc/xmlres.cpp @@ -40,16 +40,32 @@ WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords); -wxXmlResource::wxXmlResource(bool use_locale) +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); - m_useLocale = use_locale; + m_flags = flags; m_version = -1; } -wxXmlResource::wxXmlResource(const wxString& filemask, bool use_locale) +wxXmlResource::wxXmlResource(const wxString& filemask, int flags) { - m_useLocale = use_locale; + m_flags = flags; m_version = -1; m_handlers.DeleteContents(TRUE); Load(filemask); @@ -84,9 +100,9 @@ bool wxXmlResource::Load(const wxString& filemask) { #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 @@ -131,18 +147,19 @@ wxMenu *wxXmlResource::LoadMenu(const wxString& name) -wxMenuBar *wxXmlResource::LoadMenuBar(const wxString& name) +wxMenuBar *wxXmlResource::LoadMenuBar(wxWindow *parent, const wxString& name) { - return (wxMenuBar*)CreateResFromNode(FindResource(name, wxT("wxMenuBar")), NULL, NULL); + return (wxMenuBar*)CreateResFromNode(FindResource(name, wxT("wxMenuBar")), parent, NULL); } +#if wxUSE_TOOLBAR wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name) { return (wxToolBar*)CreateResFromNode(FindResource(name, wxT("wxToolBar")), parent, NULL); } - +#endif wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name) @@ -269,6 +286,17 @@ void wxXmlResource::UpdateResources() 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); @@ -288,7 +316,7 @@ void wxXmlResource::UpdateResources() if (modif) { - wxInputStream *stream = NULL; + wxInputStream *stream = NULL; # if wxUSE_FILESYSTEM file = fsys.OpenFile(m_data[i].File); @@ -303,9 +331,10 @@ void wxXmlResource::UpdateResources() 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")) @@ -343,29 +372,64 @@ void wxXmlResource::UpdateResources() } +wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent, + const wxString& name, + const wxString& classname, + bool recursive) +{ + wxString dummy; + wxXmlNode *node; + + // first search for match at the top-level nodes (as this is + // 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") || + node->GetName() == wxT("object_ref")) && + (!classname || + node->GetPropVal(wxT("class"), wxEmptyString) == classname) && + node->GetPropVal(wxT("name"), &dummy) && dummy == name ) + return node; + } + + if ( recursive ) + for (node = parent->GetChildren(); node; node = node->GetNext()) + { + if ( node->GetType() == wxXML_ELEMENT_NODE && + (node->GetName() == wxT("object") || + node->GetName() == wxT("object_ref")) ) + { + wxXmlNode* found = DoFindResource(node, name, classname, TRUE); + if ( found ) + return found; + } + } + + return NULL; +} -wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& classname) +wxXmlNode *wxXmlResource::FindResource(const wxString& name, + const wxString& classname, + bool recursive) { UpdateResources(); //ensure everything is up-to-date wxString dummy; for (size_t f = 0; f < m_data.GetCount(); f++) { - if (m_data[f].Doc == NULL || m_data[f].Doc->GetRoot() == NULL) continue; - for (wxXmlNode *node = m_data[f].Doc->GetRoot()->GetChildren(); - node; node = node->GetNext()) - if (node->GetType() == wxXML_ELEMENT_NODE && - (!classname || - node->GetPropVal(wxT("class"), wxEmptyString) == classname) && - node->GetName() == wxT("object") && - node->GetPropVal(wxT("name"), &dummy) && - dummy == name) - { + if ( m_data[f].Doc == NULL || m_data[f].Doc->GetRoot() == NULL ) + continue; + + wxXmlNode* found = DoFindResource(m_data[f].Doc->GetRoot(), + name, classname, recursive); + if ( found ) + { #if wxUSE_FILESYSTEM - m_curFileSystem.ChangePathTo(m_data[f].File); + m_curFileSystem.ChangePathTo(m_data[f].File); #endif - return node; - } + return found; + } } wxLogError(_("XRC resource '%s' (class '%s') not found!"), @@ -373,12 +437,74 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& cla return NULL; } +static void MergeNodes(wxXmlNode& dest, wxXmlNode& with) +{ + // Merge properties: + for (wxXmlProperty *prop = with.GetProperties(); prop; prop = prop->GetNext()) + { + wxXmlProperty *dprop; + for (dprop = dest.GetProperties(); dprop; dprop = dprop->GetNext()) + { + + if ( dprop->GetName() == prop->GetName() ) + { + dprop->SetValue(prop->GetValue()); + break; + } + } + if ( !dprop ) + dest.AddProperty(prop->GetName(), prop->GetValue()); + } + + // Merge child nodes: + for (wxXmlNode* node = with.GetChildren(); node; node = node->GetNext()) + { + wxString name = node->GetPropVal(wxT("name"), wxEmptyString); + wxXmlNode *dnode; + + for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() ) + { + if ( dnode->GetName() == node->GetName() && + dnode->GetPropVal("name", wxEmptyString) == name && + dnode->GetType() == node->GetType() ) + { + MergeNodes(*dnode, *node); + break; + } + } + + if ( !dnode ) + dest.AddChild(new wxXmlNode(*node)); + } + + if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().Length() ) + dest.SetContent(with.GetContent()); +} wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance) { if (node == NULL) return NULL; + // handling of referenced resource + if ( node->GetName() == wxT("object_ref") ) + { + wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString); + wxXmlNode* refNode = FindResource(refName, wxEmptyString, TRUE); + + if ( !refNode ) + { + wxLogError(_("Referenced object node with ref=\"%s\" not found!"), + refName.c_str()); + return NULL; + } + + wxXmlNode copy(*refNode); + MergeNodes(copy, *node); + + return CreateResFromNode(©, parent, instance); + } + wxXmlResourceHandler *handler; wxObject *ret; wxNode * ND = m_handlers.GetFirst(); @@ -402,11 +528,6 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx - - - - - wxXmlResourceHandler::wxXmlResourceHandler() : m_node(NULL), m_parent(NULL), m_instance(NULL), m_parentAsWindow(NULL), m_instanceAsWindow(NULL) @@ -421,10 +542,28 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent wxObject *myParent = m_parent, *myInstance = m_instance; wxWindow *myParentAW = m_parentAsWindow, *myInstanceAW = m_instanceAsWindow; + m_instance = instance; + if (!m_instance && node->HasProp(wxT("subclass")) && + !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING)) + { + wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString); + wxClassInfo* classInfo = wxClassInfo::FindClass(subclass); + + if (classInfo) + m_instance = classInfo->CreateObject(); + + if (!m_instance) + { + wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"), + subclass.c_str(), node->GetPropVal(wxT("name"), wxEmptyString).c_str()); + } + + m_instance = classInfo->CreateObject(); + } + m_node = node; m_class = node->GetPropVal(wxT("class"), wxEmptyString); m_parent = parent; - m_instance = instance; m_parentAsWindow = wxDynamicCast(m_parent, wxWindow); m_instanceAsWindow = wxDynamicCast(m_instance, wxWindow); @@ -449,15 +588,15 @@ void wxXmlResourceHandler::AddStyle(const wxString& name, int value) void wxXmlResourceHandler::AddWindowStyles() { - ADD_STYLE(wxSIMPLE_BORDER); - ADD_STYLE(wxSUNKEN_BORDER); - ADD_STYLE(wxDOUBLE_BORDER); - ADD_STYLE(wxRAISED_BORDER); - ADD_STYLE(wxSTATIC_BORDER); - ADD_STYLE(wxNO_BORDER); - ADD_STYLE(wxTRANSPARENT_WINDOW); - ADD_STYLE(wxWANTS_CHARS); - ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE); + XRC_ADD_STYLE(wxSIMPLE_BORDER); + XRC_ADD_STYLE(wxSUNKEN_BORDER); + XRC_ADD_STYLE(wxDOUBLE_BORDER); + XRC_ADD_STYLE(wxRAISED_BORDER); + XRC_ADD_STYLE(wxSTATIC_BORDER); + XRC_ADD_STYLE(wxNO_BORDER); + XRC_ADD_STYLE(wxTRANSPARENT_WINDOW); + XRC_ADD_STYLE(wxWANTS_CHARS); + XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE); } @@ -492,14 +631,14 @@ 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 str2; const wxChar *dt; wxChar amp_char; - if (m_resource->GetUseLocale()) + if (translate && m_resource->GetFlags() & wxXRC_USE_LOCALE) str1 = wxGetTranslation(GetParamValue(param)); else str1 = GetParamValue(param); @@ -574,7 +713,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); } @@ -903,32 +1042,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) { @@ -938,10 +1077,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; @@ -949,20 +1088,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]); } @@ -974,22 +1113,19 @@ static void CleanXMLID_Records() // --------------- 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(); } };