X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/426bb74a93e80251ecbccff454ff4715cd05f6a9..e7d5dd022c9555a097a14bd42dfc5d57467d0864:/contrib/src/xml/xmlres.cpp diff --git a/contrib/src/xml/xmlres.cpp b/contrib/src/xml/xmlres.cpp index ee8299df4b..7a5bd4ee74 100644 --- a/contrib/src/xml/xmlres.cpp +++ b/contrib/src/xml/xmlres.cpp @@ -21,6 +21,7 @@ #include "wx/dialog.h" #include "wx/panel.h" +#include "wx/frame.h" #include "wx/wfstream.h" #include "wx/filesys.h" #include "wx/log.h" @@ -39,16 +40,18 @@ WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords); -wxXmlResource::wxXmlResource(bool use_locale = TRUE) +wxXmlResource::wxXmlResource(bool use_locale) { - m_Handlers.DeleteContents(TRUE); - m_UseLocale = use_locale; + m_handlers.DeleteContents(TRUE); + m_useLocale = use_locale; + m_version = -1; } -wxXmlResource::wxXmlResource(const wxString& filemask, bool use_locale = TRUE) +wxXmlResource::wxXmlResource(const wxString& filemask, bool use_locale) { - m_UseLocale = use_locale; - m_Handlers.DeleteContents(TRUE); + m_useLocale = use_locale; + m_version = -1; + m_handlers.DeleteContents(TRUE); Load(filemask); } @@ -63,6 +66,7 @@ bool wxXmlResource::Load(const wxString& filemask) wxString fnd; wxXmlResourceDataRecord *drec; bool iswild = wxIsWild(filemask); + bool rt = TRUE; #if wxUSE_FILESYSTEM wxFileSystem fsys; @@ -82,24 +86,15 @@ bool wxXmlResource::Load(const wxString& filemask) if (filemask.Lower().Matches("*.zip") || filemask.Lower().Matches("*.rsc")) { - wxFileSystem fs2; - wxString fnd2; - - fnd2 = fs2.FindFirst(fnd + wxT("#zip:*.xmb"), wxFILE); - while (!!fnd2) - { - drec = new wxXmlResourceDataRecord; - drec->File = fnd2; - m_Data.Add(drec); - fnd2 = fs2.FindNext(); - } + rt = rt && Load(fnd + wxT("#zip:*.xmb")); + rt = rt && Load(fnd + wxT("#zip:*.xrc")); } else #endif { drec = new wxXmlResourceDataRecord; drec->File = fnd; - m_Data.Add(drec); + m_data.Add(drec); } if (iswild) @@ -109,14 +104,14 @@ bool wxXmlResource::Load(const wxString& filemask) } # undef wxXmlFindFirst # undef wxXmlFindNext - return TRUE; + return rt; } void wxXmlResource::AddHandler(wxXmlResourceHandler *handler) { - m_Handlers.Append(handler); + m_handlers.Append(handler); handler->SetParentResource(this); } @@ -124,28 +119,28 @@ void wxXmlResource::AddHandler(wxXmlResourceHandler *handler) void wxXmlResource::ClearHandlers() { - m_Handlers.Clear(); + m_handlers.Clear(); } wxMenu *wxXmlResource::LoadMenu(const wxString& name) { - return (wxMenu*)CreateResFromNode(FindResource(name, wxT("menu")), NULL, NULL); + return (wxMenu*)CreateResFromNode(FindResource(name, wxT("wxMenu")), NULL, NULL); } wxMenuBar *wxXmlResource::LoadMenuBar(const wxString& name) { - return (wxMenuBar*)CreateResFromNode(FindResource(name, wxT("menubar")), NULL, NULL); + return (wxMenuBar*)CreateResFromNode(FindResource(name, wxT("wxMenuBar")), NULL, NULL); } wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name) { - return (wxToolBar*)CreateResFromNode(FindResource(name, wxT("toolbar")), parent, NULL); + return (wxToolBar*)CreateResFromNode(FindResource(name, wxT("wxToolBar")), parent, NULL); } @@ -160,30 +155,30 @@ wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name) bool wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name) { - return CreateResFromNode(FindResource(name, wxT("dialog")), parent, dlg) != NULL; + return CreateResFromNode(FindResource(name, wxT("wxDialog")), parent, dlg) != NULL; } wxPanel *wxXmlResource::LoadPanel(wxWindow *parent, const wxString& name) { - wxPanel *panel = new wxPanel; - if (!LoadPanel(panel, parent, name)) - { delete panel; return NULL; } - else return panel; + return (wxPanel*)CreateResFromNode(FindResource(name, wxT("wxPanel")), parent, NULL); } bool wxXmlResource::LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name) { - return CreateResFromNode(FindResource(name, wxT("panel")), parent, panel) != NULL; + return CreateResFromNode(FindResource(name, wxT("wxPanel")), parent, panel) != NULL; } - +bool wxXmlResource::LoadFrame(wxFrame* frame, wxWindow *parent, const wxString& name) +{ + return CreateResFromNode(FindResource(name, wxT("wxFrame")), parent, frame) != NULL; +} wxBitmap wxXmlResource::LoadBitmap(const wxString& name) { wxBitmap *bmp = (wxBitmap*)CreateResFromNode( - FindResource(name, wxT("bitmap")), NULL, NULL); + FindResource(name, wxT("wxBitmap")), NULL, NULL); wxBitmap rt; if (bmp) { rt = *bmp; delete bmp; } @@ -193,7 +188,7 @@ wxBitmap wxXmlResource::LoadBitmap(const wxString& name) wxIcon wxXmlResource::LoadIcon(const wxString& name) { wxIcon *icon = (wxIcon*)CreateResFromNode( - FindResource(name, wxT("icon")), NULL, NULL); + FindResource(name, wxT("wxIcon")), NULL, NULL); wxIcon rt; if (icon) { rt = *icon; delete icon; } @@ -211,7 +206,7 @@ void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node) while (c) { isok = FALSE; - if (!c->GetPropVal(_T("platform"), &s)) + if (!c->GetPropVal(wxT("platform"), &s)) isok = TRUE; else { @@ -222,13 +217,13 @@ void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node) s = tkn.GetNextToken(); if ( #ifdef __WXMSW__ - s == wxString(_T("win")) + s == wxString(wxT("win")) #elif defined(__UNIX__) - s == wxString(_T("unix")) + s == wxString(wxT("unix")) #elif defined(__MAC__) - s == wxString(_T("mac")) + s == wxString(wxT("mac")) #elif defined(__OS2__) - s == wxString(_T("os2")) + s == wxString(wxT("os2")) #else FALSE #endif @@ -254,62 +249,78 @@ void wxXmlResource::UpdateResources() { bool modif; # if wxUSE_FILESYSTEM - wxFSFile *file; + wxFSFile *file = NULL; wxFileSystem fsys; # endif - for (size_t i = 0; i < m_Data.GetCount(); i++) + for (size_t i = 0; i < m_data.GetCount(); i++) { - modif = (m_Data[i].Doc == NULL); + modif = (m_data[i].Doc == NULL); if (!modif) { # if wxUSE_FILESYSTEM - file = fsys.OpenFile(m_Data[i].File); - modif = file && file->GetModificationTime() > m_Data[i].Time; + file = fsys.OpenFile(m_data[i].File); + modif = file && file->GetModificationTime() > m_data[i].Time; if (!file) - wxLogError(_("Cannot open file '%s'."), m_Data[i].File.c_str()); - delete file; + wxLogError(_("Cannot open file '%s'."), m_data[i].File.c_str()); + wxDELETE(file); # else - modif = wxDateTime(wxFileModificationTime(m_Data[i].File)) > m_Data[i].Time; + modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time; # endif } if (modif) { - wxInputStream *stream; + wxInputStream *stream = NULL; # if wxUSE_FILESYSTEM - file = fsys.OpenFile(m_Data[i].File); - stream = file->GetStream(); + file = fsys.OpenFile(m_data[i].File); + if (file) + stream = file->GetStream(); # else - stream = new wxFileInputStream(m_Data[i].File); + stream = new wxFileInputStream(m_data[i].File); # endif if (stream) { - delete m_Data[i].Doc; - m_Data[i].Doc = new wxXmlDocument; + 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)) { - wxLogError(_("Cannot load resources from file '%s'."), m_Data[i].File.c_str()); - delete m_Data[i].Doc; - m_Data[i].Doc = NULL; + 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() != _T("resource")) + else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource")) { - wxLogError(_("Invalid XML resource '%s': doesn't have root node 'resource'."), m_Data[i].File.c_str()); - delete m_Data[i].Doc; - m_Data[i].Doc = NULL; + wxLogError(_("Invalid XML resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str()); + wxDELETE(m_data[i].Doc); } else - ProcessPlatformProperty(m_Data[i].Doc->GetRoot()); + { + long version; + int v1, v2, v3, v4; + wxString verstr = m_data[i].Doc->GetRoot()->GetPropVal( + wxT("version"), wxT("0.0.0.0")); + if (wxSscanf(verstr.c_str(), wxT("%i.%i.%i.%i"), + &v1, &v2, &v3, &v4) == 4) + version = v1*256*256*256+v2*256*256+v3*256+v4; + else + version = 0; + if (m_version == -1) + m_version = version; + if (m_version != version) + wxLogError(_("Resource files must have same version number!")); + + ProcessPlatformProperty(m_data[i].Doc->GetRoot()); + m_data[i].Time = file->GetModificationTime(); + } # if wxUSE_FILESYSTEM - delete file; + wxDELETE(file); # else - delete stream; + wxDELETE(stream); # endif } } @@ -317,30 +328,32 @@ void wxXmlResource::UpdateResources() -wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& type) +wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& classname) { UpdateResources(); //ensure everything is up-to-date wxString dummy; - for (size_t f = 0; f < m_Data.GetCount(); f++) + 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(); + 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 && - (!type || node->GetName() == type) && - node->GetPropVal(wxT("name"), &dummy) && - dummy == name) + 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 wxUSE_FILESYSTEM - m_CurFileSystem.ChangePathTo(m_Data[f].File); + m_curFileSystem.ChangePathTo(m_data[f].File); #endif return node; } } - wxLogError(_("XML resource '%s' (type '%s') not found!"), - name.c_str(), type.c_str()); + wxLogError(_("XML resource '%s' (class '%s') not found!"), + name.c_str(), classname.c_str()); return NULL; } @@ -352,11 +365,11 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx wxXmlResourceHandler *handler; wxObject *ret; - wxNode * ND = m_Handlers.GetFirst(); + wxNode * ND = m_handlers.GetFirst(); while (ND) { handler = (wxXmlResourceHandler*)ND->GetData(); - if (handler->CanHandle(node)) + if (node->GetName() == wxT("object") && handler->CanHandle(node)) { ret = handler->CreateResource(node, parent, instance); if (ret) return ret; @@ -364,7 +377,9 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx ND = ND->GetNext(); } - wxLogError(_("No handler found for XML node '%s'!"), node->GetName().c_str()); + wxLogError(_("No handler found for XML node '%s', class '%s'!"), + node->GetName().c_str(), + node->GetPropVal(wxT("class"), wxEmptyString).c_str()); return NULL; } @@ -377,29 +392,32 @@ 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) + : m_node(NULL), m_parent(NULL), m_instance(NULL), + m_parentAsWindow(NULL), m_instanceAsWindow(NULL) {} wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance) { - wxXmlNode *myNode = m_Node; - wxObject *myParent = m_Parent, *myInstance = m_Instance; - wxWindow *myParentAW = m_ParentAsWindow, *myInstanceAW = m_InstanceAsWindow; + wxXmlNode *myNode = m_node; + wxString myClass = m_class; + wxObject *myParent = m_parent, *myInstance = m_instance; + wxWindow *myParentAW = m_parentAsWindow, *myInstanceAW = m_instanceAsWindow; - m_Node = node; - m_Parent = parent; - m_Instance = instance; - m_ParentAsWindow = wxDynamicCast(m_Parent, wxWindow); - m_InstanceAsWindow = wxDynamicCast(m_Instance, wxWindow); + 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); wxObject *returned = DoCreateResource(); - m_Node = myNode; - m_Parent = myParent; m_ParentAsWindow = myParentAW; - m_Instance = myInstance; m_InstanceAsWindow = myInstanceAW; + m_node = myNode; + m_class = myClass; + m_parent = myParent; m_parentAsWindow = myParentAW; + m_instance = myInstance; m_instanceAsWindow = myInstanceAW; return returned; } @@ -407,8 +425,8 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent void wxXmlResourceHandler::AddStyle(const wxString& name, int value) { - m_StyleNames.Add(name); - m_StyleValues.Add(value); + m_styleNames.Add(name); + m_styleValues.Add(value); } @@ -439,16 +457,16 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults) if (!s) return defaults; - wxStringTokenizer tkn(s, _T("| "), wxTOKEN_STRTOK); + wxStringTokenizer tkn(s, wxT("| "), wxTOKEN_STRTOK); int style = 0; int index; wxString fl; while (tkn.HasMoreTokens()) { fl = tkn.GetNextToken(); - index = m_StyleNames.Index(fl); + index = m_styleNames.Index(fl); if (index != wxNOT_FOUND) - style |= m_StyleValues[index]; + style |= m_styleValues[index]; else wxLogError(_("Unknown style flag ") + fl); } @@ -462,30 +480,40 @@ wxString wxXmlResourceHandler::GetText(const wxString& param) wxString str1 = GetParamValue(param); wxString str2; const wxChar *dt; + wxChar amp_char; + + // VS: First version of XML 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 + amp_char = wxT('_'); for (dt = str1.c_str(); *dt; dt++) { - // Remap $ to &, map $$ to $ (for things like "&File..." -- - // this is illegal in XML, so we use "$File..."): - if (*dt == '$') - switch (*(++dt)) - { - case '$' : str2 << '$'; break; - default : str2 << '&' << *dt; break; - } - // Remap \n to CR, \r LF, \t to TAB: - else if (*dt == '\\') + // Remap amp_char to &, map double amp_char to amp_char (for things + // like "&File..." -- this is illegal in XML, so we use "_File..."): + if (*dt == amp_char) + { + if ( *(++dt) == amp_char ) + str2 << amp_char; + else + str2 << wxT('&') << *dt; + } + // Remap \n to CR, \r to LF, \t to TAB: + else if (*dt == wxT('\\')) switch (*(++dt)) { - case 'n' : str2 << '\n'; break; - case 't' : str2 << '\t'; break; - case 'r' : str2 << '\r'; break; - default : str2 << '\\' << *dt; break; + case wxT('n') : str2 << wxT('\n'); break; + case wxT('t') : str2 << wxT('\t'); break; + case wxT('r') : str2 << wxT('\r'); break; + default : str2 << wxT('\\') << *dt; break; } else str2 << *dt; } - if (m_Resource->GetUseLocale()) + if (m_resource->GetUseLocale()) return wxGetTranslation(str2); else return str2; @@ -510,9 +538,9 @@ int wxXmlResourceHandler::GetID() wxString sid = GetName(); long num; - if (sid == _T("-1")) return -1; + if (sid == wxT("-1")) return -1; else if (sid.IsNumber() && sid.ToLong(&num)) return num; -#define stdID(id) else if (sid == _T(#id)) return id +#define stdID(id) else if (sid == wxT(#id)) return id stdID(wxID_OPEN); stdID(wxID_CLOSE); stdID(wxID_NEW); stdID(wxID_SAVE); stdID(wxID_SAVEAS); stdID(wxID_REVERT); stdID(wxID_EXIT); stdID(wxID_UNDO); stdID(wxID_REDO); @@ -533,7 +561,7 @@ int wxXmlResourceHandler::GetID() wxString wxXmlResourceHandler::GetName() { - return m_Node->GetPropVal(_T("name"), _T("-1")); + return m_node->GetPropVal(wxT("name"), wxT("-1")); } @@ -543,7 +571,7 @@ bool wxXmlResourceHandler::GetBool(const wxString& param, bool defaultv) wxString v = GetParamValue(param); v.MakeLower(); if (!v) return defaultv; - else return (v == _T("1")); + else return (v == wxT("1")); } @@ -553,8 +581,8 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param) wxString v = GetParamValue(param); unsigned long tmp = 0; - if (v.Length() != 7 || v[0] != _T('#') || - wxSscanf(v.c_str(), _T("#%lX"), &tmp) != 1) + if (v.Length() != 7 || v[0u] != wxT('#') || + wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1) { wxLogError(_("XML resource: Incorrect colour specification '%s' for property '%s'."), v.c_str(), param.c_str()); @@ -582,7 +610,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size) wxImage img(*(fsfile->GetStream())); delete fsfile; #else - wxImage img(GetParamValue(_T("bitmap"))); + wxImage img(GetParamValue(wxT("bitmap"))); #endif if (!img.Ok()) { @@ -613,7 +641,7 @@ wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, wxSize size) wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param) { - wxXmlNode *n = m_Node->GetChildren(); + wxXmlNode *n = m_node->GetChildren(); while (n) { @@ -646,7 +674,7 @@ wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node) wxString wxXmlResourceHandler::GetParamValue(const wxString& param) { if (param.IsEmpty()) - return GetNodeContent(m_Node); + return GetNodeContent(m_node); else return GetNodeContent(GetParamNode(param)); } @@ -656,15 +684,15 @@ wxString wxXmlResourceHandler::GetParamValue(const wxString& param) wxSize wxXmlResourceHandler::GetSize(const wxString& param) { wxString s = GetParamValue(param); - if (s.IsEmpty()) s = _T("-1,-1"); + if (s.IsEmpty()) s = wxT("-1,-1"); bool is_dlg; long sx, sy; - is_dlg = s[s.Length()-1] == _T('d'); + is_dlg = s[s.Length()-1] == wxT('d'); if (is_dlg) s.RemoveLast(); - if (!s.BeforeFirst(_T(',')).ToLong(&sx) || - !s.AfterLast(_T(',')).ToLong(&sy)) + if (!s.BeforeFirst(wxT(',')).ToLong(&sx) || + !s.AfterLast(wxT(',')).ToLong(&sy)) { wxLogError(_("Cannot parse coordinates from '%s'."), s.mb_str()); return wxDefaultSize; @@ -672,10 +700,10 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param) if (is_dlg) { - if (m_InstanceAsWindow) - return wxDLG_UNIT(m_InstanceAsWindow, wxSize(sx, sy)); - else if (m_ParentAsWindow) - return wxDLG_UNIT(m_ParentAsWindow, wxSize(sx, sy)); + if (m_instanceAsWindow) + return wxDLG_UNIT(m_instanceAsWindow, wxSize(sx, sy)); + else if (m_parentAsWindow) + return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, sy)); else { wxLogError(_("Cannot convert dialog units: dialog unknown.")); @@ -702,7 +730,7 @@ wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaul bool is_dlg; long sx; - is_dlg = s[s.Length()-1] == _T('d'); + is_dlg = s[s.Length()-1] == wxT('d'); if (is_dlg) s.RemoveLast(); if (!s.ToLong(&sx)) @@ -713,10 +741,10 @@ wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaul if (is_dlg) { - if (m_InstanceAsWindow) - return wxDLG_UNIT(m_InstanceAsWindow, wxSize(sx, 0)).x; - else if (m_ParentAsWindow) - return wxDLG_UNIT(m_ParentAsWindow, wxSize(sx, 0)).x; + if (m_instanceAsWindow) + return wxDLG_UNIT(m_instanceAsWindow, wxSize(sx, 0)).x; + else if (m_parentAsWindow) + return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, 0)).x; else { wxLogError(_("Cannot convert dialog units: dialog unknown.")); @@ -737,40 +765,40 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) return wxNullFont; } - wxXmlNode *oldnode = m_Node; - m_Node = font_node; + wxXmlNode *oldnode = m_node; + m_node = font_node; - long size = GetLong(_T("size"), 12); + long size = GetLong(wxT("size"), 12); - wxString style = GetParamValue(_T("style")); - wxString weight = GetParamValue(_T("weight")); + wxString style = GetParamValue(wxT("style")); + wxString weight = GetParamValue(wxT("weight")); int istyle = wxNORMAL, iweight = wxNORMAL; - if (style == _T("italic")) istyle = wxITALIC; - else if (style == _T("slant")) istyle = wxSLANT; - if (weight == _T("bold")) iweight = wxBOLD; - else if (weight == _T("light")) iweight = wxLIGHT; + if (style == wxT("italic")) istyle = wxITALIC; + else if (style == wxT("slant")) istyle = wxSLANT; + if (weight == wxT("bold")) iweight = wxBOLD; + else if (weight == wxT("light")) iweight = wxLIGHT; - wxString family = GetParamValue(_T("family")); + wxString family = GetParamValue(wxT("family")); int ifamily = wxDEFAULT; - if (family == _T("decorative")) ifamily = wxDECORATIVE; - else if (family == _T("roman")) ifamily = wxROMAN; - else if (family == _T("script")) ifamily = wxSCRIPT; - else if (family == _T("swiss")) ifamily = wxSWISS; - else if (family == _T("modern")) ifamily = wxMODERN; + if (family == wxT("decorative")) ifamily = wxDECORATIVE; + else if (family == wxT("roman")) ifamily = wxROMAN; + else if (family == wxT("script")) ifamily = wxSCRIPT; + else if (family == wxT("swiss")) ifamily = wxSWISS; + else if (family == wxT("modern")) ifamily = wxMODERN; - bool underlined = GetBool(_T("underlined"), FALSE); + bool underlined = GetBool(wxT("underlined"), FALSE); - wxString encoding = GetParamValue(_T("encoding")); + wxString encoding = GetParamValue(wxT("encoding")); wxFontMapper mapper; wxFontEncoding enc = wxFONTENCODING_DEFAULT; if (!encoding.IsEmpty()) enc = mapper.CharsetToEncoding(encoding); if (enc == wxFONTENCODING_SYSTEM) enc = wxFONTENCODING_SYSTEM; - wxString faces = GetParamValue(_T("face")); + wxString faces = GetParamValue(wxT("face")); wxString facename = wxEmptyString; wxFontEnumerator enu; enu.EnumerateFacenames(); - wxStringTokenizer tk(faces, _T(",")); + wxStringTokenizer tk(faces, wxT(",")); while (tk.HasMoreTokens()) { int index = enu.GetFacenames()->Index(tk.GetNextToken(), FALSE); @@ -781,7 +809,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param) } } - m_Node = oldnode; + m_node = oldnode; wxFont font(size, ifamily, istyle, iweight, underlined, facename, enc); return font; @@ -792,46 +820,57 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd) { //FIXME : add cursor - if (HasParam(_T("exstyle"))) - wnd->SetExtraStyle(GetStyle(_T("exstyle"))); - if (HasParam(_T("bg"))) - wnd->SetBackgroundColour(GetColour(_T("bg"))); - if (HasParam(_T("fg"))) - wnd->SetForegroundColour(GetColour(_T("fg"))); - if (GetBool(_T("enabled"), 1) == 0) + if (HasParam(wxT("exstyle"))) + wnd->SetExtraStyle(GetStyle(wxT("exstyle"))); + if (HasParam(wxT("bg"))) + wnd->SetBackgroundColour(GetColour(wxT("bg"))); + if (HasParam(wxT("fg"))) + wnd->SetForegroundColour(GetColour(wxT("fg"))); + if (GetBool(wxT("enabled"), 1) == 0) wnd->Enable(FALSE); - if (GetBool(_T("focused"), 0) == 1) + if (GetBool(wxT("focused"), 0) == 1) wnd->SetFocus(); - if (GetBool(_T("hidden"), 0) == 1) + if (GetBool(wxT("hidden"), 0) == 1) wnd->Show(FALSE); #if wxUSE_TOOLTIPS - if (HasParam(_T("tooltip"))) - wnd->SetToolTip(GetText(_T("tooltip"))); + if (HasParam(wxT("tooltip"))) + wnd->SetToolTip(GetText(wxT("tooltip"))); #endif - if (HasParam(_T("font"))) + if (HasParam(wxT("font"))) wnd->SetFont(GetFont()); } -void wxXmlResourceHandler::CreateChildren(wxObject *parent, - bool only_this_handler, wxXmlNode *children_node) +void wxXmlResourceHandler::CreateChildren(wxObject *parent, bool this_hnd_only) { - if (children_node == NULL) children_node = GetParamNode(_T("children")); - if (children_node == NULL) return; - - wxXmlNode *n = children_node->GetChildren(); + wxXmlNode *n = m_node->GetChildren(); while (n) { - if (n->GetType() == wxXML_ELEMENT_NODE) + if (n->GetType() == wxXML_ELEMENT_NODE && + n->GetName() == wxT("object")) { - if (only_this_handler) - { - if (CanHandle(n)) - CreateResource(n, parent, NULL); - } + if (this_hnd_only && CanHandle(n)) + CreateResource(n, parent, NULL); else - m_Resource->CreateResFromNode(n, parent, NULL); + m_resource->CreateResFromNode(n, parent, NULL); + } + n = n->GetNext(); + } +} + + +void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode) +{ + wxXmlNode *root; + if (rootnode == NULL) root = m_node; else root = rootnode; + wxXmlNode *n = root->GetChildren(); + + while (n) + { + if (n->GetType() == wxXML_ELEMENT_NODE && CanHandle(n)) + { + CreateResource(n, parent, NULL); } n = n->GetNext(); } @@ -858,10 +897,11 @@ struct XMLID_record }; static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {NULL}; -static int XMLID_LastID = wxID_HIGHEST; /*static*/ int wxXmlResource::GetXMLID(const char *str_id) { + static int XMLID_LastID = wxID_HIGHEST; + int index = 0; for (const char *c = str_id; *c != '\0'; c++) index += (int)*c;