#endif
#include "wx/wx.h"
-#include "wx/xml/xml.h"
-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xml.h"
+#include "wx/xrc/xmlres.h"
#include "wx/splitter.h"
#include "wx/config.h"
#include "wx/dir.h"
#include "propframe.h"
+void wxXmlRcEditDocument::UpgradeNodeValue(wxXmlNode *node)
+{
+ wxXmlNode *n = node;
+ if (n == NULL) return;
+ n = n->GetChildren();
+
+ while (n)
+ {
+ if (n->GetType() == wxXML_TEXT_NODE ||
+ n->GetType() == wxXML_CDATA_SECTION_NODE)
+ {
+ wxString str1 = n->GetContent();
+ const wxChar *dt;
+
+ for (dt = str1.c_str(); *dt; 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 == '$')
+ {
+ if ( *(++dt) != '$' )
+ str1[size_t(dt-str1.c_str()-1)] = '_';
+ }
+ }
+ n->SetContent(str1);
+ }
+ n = n->GetNext();
+ }
+}
+
+void wxXmlRcEditDocument::UpgradeNode(wxXmlNode *node)
+{
+ if (node)
+ {
+ UpgradeNodeValue(node);
+ UpgradeNode(node->GetNext());
+ UpgradeNode(node->GetChildren());
+ }
+}
+
+void wxXmlRcEditDocument::Upgrade()
+{
+ int v1,v2,v3,v4;
+ long version;
+ wxXmlNode *node = GetRoot();
+ wxString verstr = wxT("0.0.0.0");
+ node->GetPropVal(wxT("version"),verstr);
+ 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 (!version)
+ {
+ UpgradeNode(node);
+ }
+ node->DeleteProperty(wxT("version"));
+ node->AddProperty(wxT("version"), wxT(WX_XMLRES_CURRENT_VERSION_STRING));
+}
+
class EditorTreeCtrl : public wxTreeCtrl
{
delete m_Resource;
+ // create new resource in order to handle version differences properly
+ PreviewFrame::Get()->ResetResource();
+
m_FileName = "";
- m_Resource = new wxXmlDocument;
+ m_Resource = new wxXmlRcEditDocument;
m_Modified = FALSE;
if (!m_Resource->Load(filename))
else
{
m_FileName = filename;
+
+ // Upgrades old versions
+ m_Resource->Upgrade();
RefreshTree();
}
RefreshTitle();
void EditorFrame::SaveFile(const wxString& filename)
{
m_FileName = filename;
-
+
+ // save it:
if (!m_Resource->Save(filename))
wxLogError(_("Error saving ") + filename);
else
delete m_Resource;
m_FileName = "";
- m_Resource = new wxXmlDocument;
+ m_Resource = new wxXmlRcEditDocument;
m_Resource->SetRoot(new wxXmlNode(wxXML_ELEMENT_NODE, _("resource")));
m_Modified = FALSE;
wxString s;
if (m_Modified) s << _T("* ");
s << _("wxrcedit");
- if (!m_FileName)
+ if (m_FileName != "")
s << _T(" - ") << wxFileNameFromPath(m_FileName);
SetTitle(s);
}
}
RecursivelyExpand(m_TreeCtrl, event.GetItem());
- PreviewFrame::Get()->Preview(node);
+ PreviewFrame::Get()->Preview(node,m_Resource->GetRoot()->GetPropVal(
+ wxT("version"), wxT("0.0.0.0")));
}
}
{
XmlTreeData* dt = (XmlTreeData*)m_TreeCtrl->GetItemData(m_TreeCtrl->GetSelection());;
if (dt != NULL && dt->Node != NULL)
- PreviewFrame::Get()->Preview(dt->Node);
+ PreviewFrame::Get()->Preview(dt->Node,m_Resource->GetRoot()->GetPropVal(
+ wxT("version"), wxT("0.0.0.0")));
break;
}