Move MinGW builds to another machine as td165 is down.

[wxWidgets.git] / src / xrc / xmlres.cpp

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 479dbbd138ed7ed1cf6ab7f877325b4566643405..c93f2ef02303552a30d4d7a1673026bfbfa1b532 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -29,12 +29,14 @@
     #include "wx/bitmap.h"
     #include "wx/image.h"
     #include "wx/module.h"
     #include "wx/bitmap.h"
     #include "wx/image.h"
     #include "wx/module.h"

+    #include "wx/wxcrtvararg.h"

 #endif
 
 #ifndef __WXWINCE__
     #include <locale.h>
 #endif
 
 #endif
 
 #ifndef __WXWINCE__
     #include <locale.h>
 #endif
 

+#include "wx/vector.h"

 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/filename.h"
 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/filename.h"


@@ -45,8 +47,28 @@
 
 #include "wx/xml/xml.h"
 
 
 #include "wx/xml/xml.h"
 

-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords)
+
+class wxXmlResourceDataRecord
+{
+public:
+    wxXmlResourceDataRecord() : Doc(NULL) {
+#if wxUSE_DATETIME
+        Time = wxDateTime::Now();
+#endif
+    }
+    ~wxXmlResourceDataRecord() {delete Doc;}
+
+    wxString File;
+    wxXmlDocument *Doc;
+#if wxUSE_DATETIME
+    wxDateTime Time;
+#endif
+};
+
+class wxXmlResourceDataRecords : public wxVector<wxXmlResourceDataRecord*>
+{
+    // this is a class so that it can be forward-declared
+};

 
 
 wxXmlResource *wxXmlResource::ms_instance = NULL;
 
 
 wxXmlResource *wxXmlResource::ms_instance = NULL;


@@ -69,35 +91,34 @@ wxXmlResource::wxXmlResource(int flags, const wxString& domain)
 {
     m_flags = flags;
     m_version = -1;
 {
     m_flags = flags;
     m_version = -1;

-    m_domain = NULL;
-    if (! domain.empty() )
-        SetDomain(domain);
+    m_data = new wxXmlResourceDataRecords;
+    SetDomain(domain);

 }
 
 wxXmlResource::wxXmlResource(const wxString& filemask, int flags, const wxString& domain)
 {
     m_flags = flags;
     m_version = -1;
 }
 
 wxXmlResource::wxXmlResource(const wxString& filemask, int flags, const wxString& domain)
 {
     m_flags = flags;
     m_version = -1;

-    m_domain = NULL;
-    if (! domain.empty() )
-        SetDomain(domain);
+    m_data = new wxXmlResourceDataRecords;
+    SetDomain(domain);

     Load(filemask);
 }
 
 wxXmlResource::~wxXmlResource()
 {
     Load(filemask);
 }
 
 wxXmlResource::~wxXmlResource()
 {

-    if (m_domain)
-        free(m_domain);

     ClearHandlers();
     ClearHandlers();

+
+    for ( wxXmlResourceDataRecords::iterator i = m_data->begin();
+          i != m_data->end(); ++i )
+    {
+        delete *i;
+    }
+    delete m_data;

 }
 
 }
 

-void wxXmlResource::SetDomain(const wxChar* domain)
+void wxXmlResource::SetDomain(const wxString& domain)

 {
 {

-    if (m_domain)
-        free(m_domain);
-    m_domain = NULL;
-    if (domain && wxStrlen(domain))
-        m_domain = wxStrdup(domain);
+    m_domain = domain;

 }
 
 
 }
 
 


@@ -144,7 +165,6 @@ bool wxXmlResource::IsArchive(const wxString& filename)
 bool wxXmlResource::Load(const wxString& filemask)
 {
     wxString fnd;
 bool wxXmlResource::Load(const wxString& filemask)
 {
     wxString fnd;

-    wxXmlResourceDataRecord *drec;

     bool iswild = wxIsWild(filemask);
     bool rt = true;
 
     bool iswild = wxIsWild(filemask);
     bool rt = true;
 


@@ -172,9 +192,9 @@ bool wxXmlResource::Load(const wxString& filemask)
         else // a single resource URL
 #endif // wxUSE_FILESYSTEM
         {
         else // a single resource URL
 #endif // wxUSE_FILESYSTEM
         {

-            drec = new wxXmlResourceDataRecord;
+            wxXmlResourceDataRecord *drec = new wxXmlResourceDataRecord;

             drec->File = fnd;
             drec->File = fnd;

-            m_data.Add(drec);
+            Data().push_back(drec);

         }
 
         if (iswild)
         }
 
         if (iswild)


@@ -200,22 +220,23 @@ bool wxXmlResource::Unload(const wxString& filename)
 #endif // wxUSE_FILESYSTEM
 
     bool unloaded = false;
 #endif // wxUSE_FILESYSTEM
 
     bool unloaded = false;

-    const size_t count = m_data.GetCount();
-    for ( size_t i = 0; i < count; i++ )
+    for ( wxXmlResourceDataRecords::iterator i = Data().begin();
+          i != Data().end(); ++i )

     {
 #if wxUSE_FILESYSTEM
         if ( isArchive )
         {
     {
 #if wxUSE_FILESYSTEM
         if ( isArchive )
         {

-            if ( m_data[i].File.StartsWith(fnd) )
+            if ( (*i)->File.StartsWith(fnd) )

                 unloaded = true;
             // don't break from the loop, we can have other matching files
         }
         else // a single resource URL
 #endif // wxUSE_FILESYSTEM
         {
                 unloaded = true;
             // don't break from the loop, we can have other matching files
         }
         else // a single resource URL
 #endif // wxUSE_FILESYSTEM
         {

-            if ( m_data[i].File == fnd )
+            if ( (*i)->File == fnd )

             {
             {

-                m_data.RemoveAt(i);
+                delete *i;
+                Data().erase(i);

                 unloaded = true;
 
                 // no sense in continuing, there is only one file with this URL
                 unloaded = true;
 
                 // no sense in continuing, there is only one file with this URL


@@ -232,13 +253,13 @@ IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject)
 
 void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
 {
 
 void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
 {

-    m_handlers.Append(handler);
+    m_handlers.push_back(handler);

     handler->SetParentResource(this);
 }
 
 void wxXmlResource::InsertHandler(wxXmlResourceHandler *handler)
 {
     handler->SetParentResource(this);
 }
 
 void wxXmlResource::InsertHandler(wxXmlResourceHandler *handler)
 {

-    m_handlers.Insert(handler);
+    m_handlers.insert(m_handlers.begin(), handler);

     handler->SetParentResource(this);
 }
 
     handler->SetParentResource(this);
 }
 


@@ -246,7 +267,10 @@ void wxXmlResource::InsertHandler(wxXmlResourceHandler *handler)
 
 void wxXmlResource::ClearHandlers()
 {
 
 void wxXmlResource::ClearHandlers()
 {

-    WX_CLEAR_LIST(wxList, m_handlers);
+    for ( wxVector<wxXmlResourceHandler*>::iterator i = m_handlers.begin();
+          i != m_handlers.end(); ++i )
+        delete *i;
+    m_handlers.clear();

 }
 
 
 }
 
 


@@ -360,7 +384,7 @@ static void ProcessPlatformProperty(wxXmlNode *node)
     while (c)
     {
         isok = false;
     while (c)
     {
         isok = false;

-        if (!c->GetPropVal(wxT("platform"), &s))
+        if (!c->GetAttribute(wxT("platform"), &s))

             isok = true;
         else
         {
             isok = true;
         else
         {


@@ -424,29 +448,32 @@ bool wxXmlResource::UpdateResources()
     }
 #endif
 
     }
 #endif
 

-    for (size_t i = 0; i < m_data.GetCount(); i++)
+    for ( wxXmlResourceDataRecords::iterator i = Data().begin();
+          i != Data().end(); ++i )

     {
     {

-        modif = (m_data[i].Doc == NULL);
+        wxXmlResourceDataRecord* const rec = *i;
+
+        modif = (rec->Doc == NULL);

 
         if (!modif && !(m_flags & wxXRC_NO_RELOADING))
         {
 #           if wxUSE_FILESYSTEM
 
         if (!modif && !(m_flags & wxXRC_NO_RELOADING))
         {
 #           if wxUSE_FILESYSTEM

-            file = fsys.OpenFile(m_data[i].File);
+            file = fsys.OpenFile(rec->File);

 #           if wxUSE_DATETIME
 #           if wxUSE_DATETIME

-            modif = file && file->GetModificationTime() > m_data[i].Time;
+            modif = file && file->GetModificationTime() > rec->Time;

 #           else // wxUSE_DATETIME
             modif = true;
 #           endif // wxUSE_DATETIME
             if (!file)
             {
 #           else // wxUSE_DATETIME
             modif = true;
 #           endif // wxUSE_DATETIME
             if (!file)
             {

-                wxLogError(_("Cannot open file '%s'."), m_data[i].File.c_str());
+                wxLogError(_("Cannot open file '%s'."), rec->File);

                 rt = false;
             }
             wxDELETE(file);
             wxUnusedVar(file);
 #           else // wxUSE_FILESYSTEM
 #           if wxUSE_DATETIME
                 rt = false;
             }
             wxDELETE(file);
             wxUnusedVar(file);
 #           else // wxUSE_FILESYSTEM
 #           if wxUSE_DATETIME

-            modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time;
+            modif = wxDateTime(wxFileModificationTime(rec->File)) > rec->Time;

 #           else // wxUSE_DATETIME
             modif = true;
 #           endif // wxUSE_DATETIME
 #           else // wxUSE_DATETIME
             modif = true;
 #           endif // wxUSE_DATETIME


@@ -455,42 +482,41 @@ bool wxXmlResource::UpdateResources()
 
         if (modif)
         {
 
         if (modif)
         {

-            wxLogTrace(_T("xrc"),
-                       _T("opening file '%s'"), m_data[i].File.c_str());
+            wxLogTrace(_T("xrc"), _T("opening file '%s'"), rec->File);

 
             wxInputStream *stream = NULL;
 
 #           if wxUSE_FILESYSTEM
 
             wxInputStream *stream = NULL;
 
 #           if wxUSE_FILESYSTEM

-            file = fsys.OpenFile(m_data[i].File);
+            file = fsys.OpenFile(rec->File);

             if (file)
                 stream = file->GetStream();
 #           else
             if (file)
                 stream = file->GetStream();
 #           else

-            stream = new wxFileInputStream(m_data[i].File);
+            stream = new wxFileInputStream(rec->File);

 #           endif
 
             if (stream)
             {
 #           endif
 
             if (stream)
             {

-                delete m_data[i].Doc;
-                m_data[i].Doc = new wxXmlDocument;
+                delete rec->Doc;
+                rec->Doc = new wxXmlDocument;

             }
             }

-            if (!stream || !m_data[i].Doc->Load(*stream, encoding))
+            if (!stream || !rec->Doc->Load(*stream, encoding))

             {
                 wxLogError(_("Cannot load resources from file '%s'."),
             {
                 wxLogError(_("Cannot load resources from file '%s'."),

-                           m_data[i].File.c_str());
-                wxDELETE(m_data[i].Doc);
+                           rec->File);
+                wxDELETE(rec->Doc);

                 rt = false;
             }
                 rt = false;
             }

-            else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource"))
+            else if (rec->Doc->GetRoot()->GetName() != wxT("resource"))

             {
             {

-                wxLogError(_("Invalid XRC resource '%s': doesn't have root node 'resource'."), m_data[i].File.c_str());
-                wxDELETE(m_data[i].Doc);
+                wxLogError(_("Invalid XRC resource '%s': doesn't have root node 'resource'."), rec->File);
+                wxDELETE(rec->Doc);

                 rt = false;
             }
             else
             {
                 long version;
                 int v1, v2, v3, v4;
                 rt = false;
             }
             else
             {
                 long version;
                 int v1, v2, v3, v4;

-                wxString verstr = m_data[i].Doc->GetRoot()->GetPropVal(
+                wxString verstr = rec->Doc->GetRoot()->GetAttribute(

                                       wxT("version"), wxT("0.0.0.0"));
                 if (wxSscanf(verstr.c_str(), wxT("%i.%i.%i.%i"),
                     &v1, &v2, &v3, &v4) == 4)
                                       wxT("version"), wxT("0.0.0.0"));
                 if (wxSscanf(verstr.c_str(), wxT("%i.%i.%i.%i"),
                     &v1, &v2, &v3, &v4) == 4)


@@ -505,12 +531,12 @@ bool wxXmlResource::UpdateResources()
                     rt = false;
                 }
 
                     rt = false;
                 }
 

-                ProcessPlatformProperty(m_data[i].Doc->GetRoot());
+                ProcessPlatformProperty(rec->Doc->GetRoot());

 #if wxUSE_DATETIME
 #if wxUSE_FILESYSTEM
 #if wxUSE_DATETIME
 #if wxUSE_FILESYSTEM

-                m_data[i].Time = file->GetModificationTime();
+                rec->Time = file->GetModificationTime();

 #else // wxUSE_FILESYSTEM
 #else // wxUSE_FILESYSTEM

-                m_data[i].Time = wxDateTime(wxFileModificationTime(m_data[i].File));
+                rec->Time = wxDateTime(wxFileModificationTime(rec->File));

 #endif // wxUSE_FILESYSTEM
 #endif // wxUSE_DATETIME
             }
 #endif // wxUSE_FILESYSTEM
 #endif // wxUSE_DATETIME
             }


@@ -543,20 +569,20 @@ wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent,
         if ( node->GetType() == wxXML_ELEMENT_NODE &&
                  (node->GetName() == wxT("object") ||
                   node->GetName() == wxT("object_ref")) &&
         if ( node->GetType() == wxXML_ELEMENT_NODE &&
                  (node->GetName() == wxT("object") ||
                   node->GetName() == wxT("object_ref")) &&

-             node->GetPropVal(wxT("name"), &dummy) && dummy == name )
+             node->GetAttribute(wxT("name"), &dummy) && dummy == name )

         {
         {

-            wxString cls(node->GetPropVal(wxT("class"), wxEmptyString));
+            wxString cls(node->GetAttribute(wxT("class"), wxEmptyString));

             if (!classname || cls == classname)
                 return node;
             if (!classname || cls == classname)
                 return node;

-            // object_ref may not have 'class' property:
+            // object_ref may not have 'class' attribute:

             if (cls.empty() && node->GetName() == wxT("object_ref"))
             {
             if (cls.empty() && node->GetName() == wxT("object_ref"))
             {

-                wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);
+                wxString refName = node->GetAttribute(wxT("ref"), wxEmptyString);

                 if (refName.empty())
                     continue;
                 wxXmlNode* refNode = FindResource(refName, wxEmptyString, true);
                 if (refNode &&
                 if (refName.empty())
                     continue;
                 wxXmlNode* refNode = FindResource(refName, wxEmptyString, true);
                 if (refNode &&

-                    refNode->GetPropVal(wxT("class"), wxEmptyString) == classname)
+                    refNode->GetAttribute(wxT("class"), wxEmptyString) == classname)

                 {
                     return node;
                 }
                 {
                     return node;
                 }


@@ -587,17 +613,19 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name,
     UpdateResources(); //ensure everything is up-to-date
 
     wxString dummy;
     UpdateResources(); //ensure everything is up-to-date
 
     wxString dummy;

-    for (size_t f = 0; f < m_data.GetCount(); f++)
+    for ( wxXmlResourceDataRecords::const_iterator f = Data().begin();
+          f != Data().end(); ++f )

     {
     {

-        if ( m_data[f].Doc == NULL || m_data[f].Doc->GetRoot() == NULL )
+        wxXmlResourceDataRecord* const rec = *f;
+        if ( rec->Doc == NULL || rec->Doc->GetRoot() == NULL )

             continue;
 
             continue;
 

-        wxXmlNode* found = DoFindResource(m_data[f].Doc->GetRoot(),
+        wxXmlNode* found = DoFindResource(rec->Doc->GetRoot(),

                                           name, classname, recursive);
         if ( found )
         {
 #if wxUSE_FILESYSTEM
                                           name, classname, recursive);
         if ( found )
         {
 #if wxUSE_FILESYSTEM

-            m_curFileSystem.ChangePathTo(m_data[f].File);
+            m_curFileSystem.ChangePathTo(rec->File);

 #endif
             return found;
         }
 #endif
             return found;
         }


@@ -610,34 +638,35 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name,
 
 static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
 {
 
 static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
 {

-    // Merge properties:
-    for (wxXmlProperty *prop = with.GetProperties(); prop; prop = prop->GetNext())
+    // Merge attributes:
+    for ( wxXmlAttribute *attr = with.GetAttributes();
+          attr; attr = attr->GetNext() )

     {
     {

-        wxXmlProperty *dprop;
-        for (dprop = dest.GetProperties(); dprop; dprop = dprop->GetNext())
+        wxXmlAttribute *dattr;
+        for (dattr = dest.GetAttributes(); dattr; dattr = dattr->GetNext())

         {
 
         {
 

-            if ( dprop->GetName() == prop->GetName() )
+            if ( dattr->GetName() == attr->GetName() )

             {
             {

-                dprop->SetValue(prop->GetValue());
+                dattr->SetValue(attr->GetValue());

                 break;
             }
         }
 
                 break;
             }
         }
 

-        if ( !dprop )
-            dest.AddProperty(prop->GetName(), prop->GetValue());
+        if ( !dattr )
+            dest.AddAttribute(attr->GetName(), attr->GetValue());

    }
 
     // Merge child nodes:
     for (wxXmlNode* node = with.GetChildren(); node; node = node->GetNext())
     {
    }
 
     // Merge child nodes:
     for (wxXmlNode* node = with.GetChildren(); node; node = node->GetNext())
     {

-        wxString name = node->GetPropVal(wxT("name"), wxEmptyString);
+        wxString name = node->GetAttribute(wxT("name"), wxEmptyString);

         wxXmlNode *dnode;
 
         for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() )
         {
             if ( dnode->GetName() == node->GetName() &&
         wxXmlNode *dnode;
 
         for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() )
         {
             if ( dnode->GetName() == node->GetName() &&

-                 dnode->GetPropVal(wxT("name"), wxEmptyString) == name &&
+                 dnode->GetAttribute(wxT("name"), wxEmptyString) == name &&

                  dnode->GetType() == node->GetType() )
             {
                 MergeNodes(*dnode, *node);
                  dnode->GetType() == node->GetType() )
             {
                 MergeNodes(*dnode, *node);


@@ -648,7 +677,7 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
         if ( !dnode )
         {
             static const wxChar *AT_END = wxT("end");
         if ( !dnode )
         {
             static const wxChar *AT_END = wxT("end");

-            wxString insert_pos = node->GetPropVal(wxT("insert_at"), AT_END);
+            wxString insert_pos = node->GetAttribute(wxT("insert_at"), AT_END);

             if ( insert_pos == AT_END )
             {
                 dest.AddChild(new wxXmlNode(*node));
             if ( insert_pos == AT_END )
             {
                 dest.AddChild(new wxXmlNode(*node));


@@ -673,7 +702,7 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent,
     // handling of referenced resource
     if ( node->GetName() == wxT("object_ref") )
     {
     // handling of referenced resource
     if ( node->GetName() == wxT("object_ref") )
     {

-        wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);
+        wxString refName = node->GetAttribute(wxT("ref"), wxEmptyString);

         wxXmlNode* refNode = FindResource(refName, wxEmptyString, true);
 
         if ( !refNode )
         wxXmlNode* refNode = FindResource(refName, wxEmptyString, true);
 
         if ( !refNode )


@@ -689,8 +718,6 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent,
         return CreateResFromNode(&copy, parent, instance);
     }
 
         return CreateResFromNode(&copy, parent, instance);
     }
 

-    wxXmlResourceHandler *handler;
-

     if (handlerToUse)
     {
         if (handlerToUse->CanHandle(node))
     if (handlerToUse)
     {
         if (handlerToUse->CanHandle(node))


@@ -700,38 +727,36 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent,
     }
     else if (node->GetName() == wxT("object"))
     {
     }
     else if (node->GetName() == wxT("object"))
     {

-        wxList::compatibility_iterator ND = m_handlers.GetFirst();
-        while (ND)
+        for ( wxVector<wxXmlResourceHandler*>::iterator h = m_handlers.begin();
+              h != m_handlers.end(); ++h )

         {
         {

-            handler = (wxXmlResourceHandler*)ND->GetData();
+            wxXmlResourceHandler *handler = *h;

             if (handler->CanHandle(node))
             if (handler->CanHandle(node))

-            {

                 return handler->CreateResource(node, parent, instance);
                 return handler->CreateResource(node, parent, instance);

-            }
-            ND = ND->GetNext();

         }
     }
 
     wxLogError(_("No handler found for XML node '%s', class '%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());
+               node->GetAttribute(wxT("class"), wxEmptyString).c_str());

     return NULL;
 }
 
 
     return NULL;
 }
 
 

-#include "wx/listimpl.cpp"
-WX_DECLARE_LIST(wxXmlSubclassFactory, wxXmlSubclassFactoriesList);
-WX_DEFINE_LIST(wxXmlSubclassFactoriesList)
+class wxXmlSubclassFactories : public wxVector<wxXmlSubclassFactory*>
+{
+    // this is a class so that it can be forward-declared
+};

 
 

-wxXmlSubclassFactoriesList *wxXmlResource::ms_subclassFactories = NULL;
+wxXmlSubclassFactories *wxXmlResource::ms_subclassFactories = NULL;

 
 /*static*/ void wxXmlResource::AddSubclassFactory(wxXmlSubclassFactory *factory)
 {
     if (!ms_subclassFactories)
     {
 
 /*static*/ void wxXmlResource::AddSubclassFactory(wxXmlSubclassFactory *factory)
 {
     if (!ms_subclassFactories)
     {

-        ms_subclassFactories = new wxXmlSubclassFactoriesList;
+        ms_subclassFactories = new wxXmlSubclassFactories;

     }
     }

-    ms_subclassFactories->Append(factory);
+    ms_subclassFactories->push_back(factory);

 }
 
 class wxXmlSubclassFactoryCXX : public wxXmlSubclassFactory
 }
 
 class wxXmlSubclassFactoryCXX : public wxXmlSubclassFactory


@@ -768,23 +793,23 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
     wxWindow *myParentAW = m_parentAsWindow;
 
     m_instance = instance;
     wxWindow *myParentAW = m_parentAsWindow;
 
     m_instance = instance;

-    if (!m_instance && node->HasProp(wxT("subclass")) &&
+    if (!m_instance && node->HasAttribute(wxT("subclass")) &&

         !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING))
     {
         !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING))
     {

-        wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString);
+        wxString subclass = node->GetAttribute(wxT("subclass"), wxEmptyString);

         if (!subclass.empty())
         {
         if (!subclass.empty())
         {

-            for (wxXmlSubclassFactoriesList::compatibility_iterator i = wxXmlResource::ms_subclassFactories->GetFirst();
-                 i; i = i->GetNext())
+            for (wxXmlSubclassFactories::iterator i = wxXmlResource::ms_subclassFactories->begin();
+                 i != wxXmlResource::ms_subclassFactories->end(); ++i)

             {
             {

-                m_instance = i->GetData()->Create(subclass);
+                m_instance = (*i)->Create(subclass);

                 if (m_instance)
                     break;
             }
 
             if (!m_instance)
             {
                 if (m_instance)
                     break;
             }
 
             if (!m_instance)
             {

-                wxString name = node->GetPropVal(wxT("name"), wxEmptyString);
+                wxString name = node->GetAttribute(wxT("name"), wxEmptyString);

                 wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"),
                            subclass.c_str(), name.c_str());
             }
                 wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"),
                            subclass.c_str(), name.c_str());
             }


@@ -792,7 +817,7 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
     }
 
     m_node = node;
     }
 
     m_node = node;

-    m_class = node->GetPropVal(wxT("class"), wxEmptyString);
+    m_class = node->GetAttribute(wxT("class"), wxEmptyString);

     m_parent = parent;
     m_parentAsWindow = wxDynamicCast(m_parent, wxWindow);
 
     m_parent = parent;
     m_parentAsWindow = wxDynamicCast(m_parent, wxWindow);
 


@@ -931,7 +956,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
     if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
     {
         if (translate && parNode &&
     if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
     {
         if (translate && parNode &&

-            parNode->GetPropVal(wxT("translate"), wxEmptyString) != wxT("0"))
+            parNode->GetAttribute(wxT("translate"), wxEmptyString) != wxT("0"))

         {
             return wxGetTranslation(str2, m_resource->GetDomain());
         }
         {
             return wxGetTranslation(str2, m_resource->GetDomain());
         }


@@ -942,7 +967,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
 #else
             // The string is internally stored as UTF-8, we have to convert
             // it into system's default encoding so that it can be displayed:
 #else
             // The string is internally stored as UTF-8, we have to convert
             // it into system's default encoding so that it can be displayed:

-            return wxString(str2.mb_str(wxConvUTF8), wxConvLocal);
+            return wxString(str2.wc_str(wxConvUTF8), wxConvLocal);

 #endif
         }
     }
 #endif
         }
     }


@@ -968,20 +993,22 @@ long wxXmlResourceHandler::GetLong(const wxString& param, long defaultv)
 
 float wxXmlResourceHandler::GetFloat(const wxString& param, float defaultv)
 {
 
 float wxXmlResourceHandler::GetFloat(const wxString& param, float defaultv)
 {

-    double value;
-    wxString str1 = GetParamValue(param);
+    wxString str = GetParamValue(param);

 
 

-#ifndef __WXWINCE__
-    const char *prevlocale = setlocale(LC_NUMERIC, "C");
-#endif
+#if wxUSE_INTL
+    // strings in XRC always use C locale but wxString::ToDouble() uses the
+    // current one, so transform the string to it supposing that the only
+    // difference between them is the decimal separator
+    //
+    // TODO: use wxString::ToCDouble() when we have it
+    str.Replace(wxT("."), wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
+                                            wxLOCALE_CAT_NUMBER));
+#endif // wxUSE_INTL

 
 

-    if (!str1.ToDouble(&value))
+    double value;
+    if (!str.ToDouble(&value))

         value = defaultv;
 
         value = defaultv;
 

-#ifndef __WXWINCE__
-    setlocale(LC_NUMERIC, prevlocale);
-#endif
-

     return wx_truncate_cast(float, value);
 }
 
     return wx_truncate_cast(float, value);
 }
 


@@ -995,7 +1022,7 @@ int wxXmlResourceHandler::GetID()
 
 wxString wxXmlResourceHandler::GetName()
 {
 
 wxString wxXmlResourceHandler::GetName()
 {

-    return m_node->GetPropVal(wxT("name"), wxT("-1"));
+    return m_node->GetAttribute(wxT("name"), wxT("-1"));

 }
 
 
 }
 
 


@@ -1077,7 +1104,7 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param, const wxColour&
         if (clr.Ok())
             return clr;
 
         if (clr.Ok())
             return clr;
 

-        wxLogError(_("XRC resource: Incorrect colour specification '%s' for property '%s'."),
+        wxLogError(_("XRC resource: Incorrect colour specification '%s' for attribute '%s'."),

                    v.c_str(), param.c_str());
         return wxNullColour;
     }
                    v.c_str(), param.c_str());
         return wxNullColour;
     }


@@ -1095,10 +1122,10 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
     wxXmlNode *bmpNode = GetParamNode(param);
     if ( bmpNode )
     {
     wxXmlNode *bmpNode = GetParamNode(param);
     if ( bmpNode )
     {

-        wxString sid = bmpNode->GetPropVal(wxT("stock_id"), wxEmptyString);
+        wxString sid = bmpNode->GetAttribute(wxT("stock_id"), wxEmptyString);

         if ( !sid.empty() )
         {
         if ( !sid.empty() )
         {

-            wxString scl = bmpNode->GetPropVal(wxT("stock_client"), wxEmptyString);
+            wxString scl = bmpNode->GetAttribute(wxT("stock_client"), wxEmptyString);

             if (scl.empty())
                 scl = defaultArtClient;
             else
             if (scl.empty())
                 scl = defaultArtClient;
             else


@@ -1204,7 +1231,7 @@ wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param)
 
 bool wxXmlResourceHandler::IsOfClass(wxXmlNode *node, const wxString& classname)
 {
 
 bool wxXmlResourceHandler::IsOfClass(wxXmlNode *node, const wxString& classname)
 {

-    return node->GetPropVal(wxT("class"), wxEmptyString) == classname;
+    return node->GetAttribute(wxT("class"), wxEmptyString) == classname;

 }
 
 
 }
 
 


@@ -1413,8 +1440,9 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     if (hasFacename)
     {
         wxString faces = GetParamValue(wxT("face"));
     if (hasFacename)
     {
         wxString faces = GetParamValue(wxT("face"));

-        wxArrayString facenames(wxFontEnumerator::GetFacenames());

         wxStringTokenizer tk(faces, wxT(","));
         wxStringTokenizer tk(faces, wxT(","));

+#if wxUSE_FONTENUM
+        wxArrayString facenames(wxFontEnumerator::GetFacenames());

         while (tk.HasMoreTokens())
         {
             int index = facenames.Index(tk.GetNextToken(), false);
         while (tk.HasMoreTokens())
         {
             int index = facenames.Index(tk.GetNextToken(), false);


@@ -1424,6 +1452,11 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
                 break;
             }
         }
                 break;
             }
         }

+#else // !wxUSE_FONTENUM
+        // just use the first face name if we can't check its availability:
+        if (tk.HasMoreTokens())
+            facename = tk.GetNextToken();
+#endif // wxUSE_FONTENUM/!wxUSE_FONTENUM

     }
 
     // encoding
     }
 
     // encoding


@@ -1551,18 +1584,21 @@ void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode *
 
 struct XRCID_record
 {
 
 struct XRCID_record
 {

-    int id;
-    wxChar *key;
+    /* Hold the id so that once an id is allocated for a name, it
+       does not get created again by NewControlId at least
+       until we are done with it */
+    wxWindowIDRef id;
+    char *key;

     XRCID_record *next;
 };
 
 static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
 
     XRCID_record *next;
 };
 
 static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
 

-static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = wxID_NONE)
+static int XRCID_Lookup(const char *str_id, int value_if_not_found = wxID_NONE)

 {
     int index = 0;
 
 {
     int index = 0;
 

-    for (const wxChar *c = str_id; *c != wxT('\0'); c++) index += (int)*c;
+    for (const char *c = str_id; *c != '\0'; c++) index += (int)*c;

     index %= XRCID_TABLE_SIZE;
 
     XRCID_record *oldrec = NULL;
     index %= XRCID_TABLE_SIZE;
 
     XRCID_record *oldrec = NULL;


@@ -1581,7 +1617,7 @@ static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = wxID_NONE
     (*rec_var)->key = wxStrdup(str_id);
     (*rec_var)->next = NULL;
 
     (*rec_var)->key = wxStrdup(str_id);
     (*rec_var)->next = NULL;
 

-    wxChar *end;
+    char *end;

     if (value_if_not_found != wxID_NONE)
         (*rec_var)->id = value_if_not_found;
     else
     if (value_if_not_found != wxID_NONE)
         (*rec_var)->id = value_if_not_found;
     else


@@ -1594,7 +1630,7 @@ static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = wxID_NONE
         }
         else
         {
         }
         else
         {

-            (*rec_var)->id = wxNewId();
+            (*rec_var)->id = wxWindowBase::NewControlId();

         }
     }
 
         }
     }
 


@@ -1604,7 +1640,7 @@ static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = wxID_NONE
 static void AddStdXRCID_Records();
 
 /*static*/
 static void AddStdXRCID_Records();
 
 /*static*/

-int wxXmlResource::GetXRCID(const wxChar *str_id, int value_if_not_found)
+int wxXmlResource::DoGetXRCID(const char *str_id, int value_if_not_found)

 {
     static bool s_stdIDsAdded = false;
 
 {
     static bool s_stdIDsAdded = false;
 


@@ -1623,6 +1659,7 @@ static void CleanXRCID_Record(XRCID_record *rec)
     if (rec)
     {
         CleanXRCID_Record(rec->next);
     if (rec)
     {
         CleanXRCID_Record(rec->next);

+

         free(rec->key);
         delete rec;
     }
         free(rec->key);
         delete rec;
     }


@@ -1639,7 +1676,7 @@ static void CleanXRCID_Records()
 
 static void AddStdXRCID_Records()
 {
 
 static void AddStdXRCID_Records()
 {

-#define stdID(id) XRCID_Lookup(wxT(#id), id)
+#define stdID(id) XRCID_Lookup(#id, id)

     stdID(-1);
 
     stdID(wxID_ANY);
     stdID(-1);
 
     stdID(wxID_ANY);


@@ -1666,6 +1703,7 @@ static void AddStdXRCID_Records()
     stdID(wxID_HELP_CONTEXT);
     stdID(wxID_CLOSE_ALL);
     stdID(wxID_PREFERENCES);
     stdID(wxID_HELP_CONTEXT);
     stdID(wxID_CLOSE_ALL);
     stdID(wxID_PREFERENCES);

+    stdID(wxID_EDIT);

     stdID(wxID_CUT);
     stdID(wxID_COPY);
     stdID(wxID_PASTE);
     stdID(wxID_CUT);
     stdID(wxID_COPY);
     stdID(wxID_PASTE);


@@ -1752,6 +1790,17 @@ static void AddStdXRCID_Records()
 
 // --------------- module and globals -----------------------------
 
 
 // --------------- module and globals -----------------------------
 

+// normally we would do the cleanup from wxXmlResourceModule::OnExit() but it
+// can happen that some XRC records have been created because of the use of
+// XRCID() in event tables, which happens during static objects initialization,
+// but then the application initialization failed and so the wx modules were
+// neither initialized nor cleaned up -- this static object does the cleanup in
+// this case
+static struct wxXRCStaticCleanup
+{
+    ~wxXRCStaticCleanup() { CleanXRCID_Records(); }
+} s_staticCleanup;
+

 class wxXmlResourceModule: public wxModule
 {
 DECLARE_DYNAMIC_CLASS(wxXmlResourceModule)
 class wxXmlResourceModule: public wxModule
 {
 DECLARE_DYNAMIC_CLASS(wxXmlResourceModule)


@@ -1766,8 +1815,14 @@ public:
     {
         delete wxXmlResource::Set(NULL);
         if(wxXmlResource::ms_subclassFactories)
     {
         delete wxXmlResource::Set(NULL);
         if(wxXmlResource::ms_subclassFactories)

-            WX_CLEAR_LIST(wxXmlSubclassFactoriesList, *wxXmlResource::ms_subclassFactories);
-        wxDELETE(wxXmlResource::ms_subclassFactories);
+        {
+            for ( wxXmlSubclassFactories::iterator i = wxXmlResource::ms_subclassFactories->begin();
+                  i != wxXmlResource::ms_subclassFactories->end(); ++i )
+            {
+                delete *i;
+            }
+            wxDELETE(wxXmlResource::ms_subclassFactories);
+        }

         CleanXRCID_Records();
     }
 };
         CleanXRCID_Records();
     }
 };