readding trace constant

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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index cad7f1465c819b8535bee18ffc18059798b56d16..52de6a660b4138fcae666d7cef98d2be14da3853 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xmlres.cpp
+// Name:        src/xrc/xmlres.cpp

 // Purpose:     XRC resources
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // Purpose:     XRC resources
 // Author:      Vaclav Slavik
 // Created:     2000/03/05


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "xmlres.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -21,30 +17,58 @@
 
 #if wxUSE_XRC
 
 
 #if wxUSE_XRC
 

-#include <locale.h>
+#include "wx/xrc/xmlres.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/panel.h"
+    #include "wx/frame.h"
+    #include "wx/dialog.h"
+    #include "wx/settings.h"
+    #include "wx/bitmap.h"
+    #include "wx/image.h"
+    #include "wx/module.h"
+    #include "wx/wxcrtvararg.h"
+#endif
+
+#ifndef __WXWINCE__
+    #include <locale.h>
+#endif

 
 

-#include "wx/dialog.h"
-#include "wx/panel.h"
-#include "wx/frame.h"
+#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"

-#include "wx/log.h"
-#include "wx/intl.h"

 #include "wx/tokenzr.h"
 #include "wx/fontenum.h"
 #include "wx/tokenzr.h"
 #include "wx/fontenum.h"

-#include "wx/module.h"
-#include "wx/bitmap.h"
-#include "wx/image.h"

 #include "wx/fontmap.h"
 #include "wx/artprov.h"
 #include "wx/fontmap.h"
 #include "wx/artprov.h"

-#include "wx/settings.h"

 
 #include "wx/xml/xml.h"
 
 #include "wx/xml/xml.h"

-#include "wx/xrc/xmlres.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;


@@ -63,29 +87,79 @@ wxXmlResource *wxXmlResource::ms_instance = NULL;
     return old;
 }
 
     return old;
 }
 

-wxXmlResource::wxXmlResource(int flags)
+wxXmlResource::wxXmlResource(int flags, const wxString& domain)

 {
     m_flags = flags;
     m_version = -1;
 {
     m_flags = flags;
     m_version = -1;

+    m_data = new wxXmlResourceDataRecords;
+    SetDomain(domain);

 }
 
 }
 

-wxXmlResource::wxXmlResource(const wxString& filemask, int flags)
+wxXmlResource::wxXmlResource(const wxString& filemask, int flags, const wxString& domain)

 {
     m_flags = flags;
     m_version = -1;
 {
     m_flags = flags;
     m_version = -1;

+    m_data = new wxXmlResourceDataRecords;
+    SetDomain(domain);

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

+
+    delete m_data;

 }
 
 }
 

+void wxXmlResource::SetDomain(const wxString& domain)
+{
+    m_domain = domain;
+}
+
+
+/* static */
+wxString wxXmlResource::ConvertFileNameToURL(const wxString& filename)
+{
+    wxString fnd(filename);
+
+    // NB: as Load() and Unload() accept both filenames and URLs (should
+    //     probably be changed to filenames only, but embedded resources
+    //     currently rely on its ability to handle URLs - FIXME) we need to
+    //     determine whether found name is filename and not URL and this is the
+    //     fastest/simplest way to do it
+    if (wxFileName::FileExists(fnd))
+    {
+        // Make the name absolute filename, because the app may
+        // change working directory later:
+        wxFileName fn(fnd);
+        if (fn.IsRelative())
+        {
+            fn.MakeAbsolute();
+            fnd = fn.GetFullPath();
+        }
+#if wxUSE_FILESYSTEM
+        fnd = wxFileSystem::FileNameToURL(fnd);
+#endif
+    }
+
+    return fnd;
+}
+
+#if wxUSE_FILESYSTEM
+
+/* static */
+bool wxXmlResource::IsArchive(const wxString& filename)
+{
+    const wxString fnd = filename.Lower();
+
+    return fnd.Matches(wxT("*.zip")) || fnd.Matches(wxT("*.xrs"));
+}
+
+#endif // wxUSE_FILESYSTEM

 
 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;
 


@@ -101,40 +175,21 @@ bool wxXmlResource::Load(const wxString& filemask)
         fnd = wxXmlFindFirst;
     else
         fnd = filemask;
         fnd = wxXmlFindFirst;
     else
         fnd = filemask;

-    while (!!fnd)
+    while (!fnd.empty())

     {
     {

-        // NB: Load() accepts both filenames and URLs (should probably be
-        //     changed to filenames only, but embedded resources currently
-        //     rely on its ability to handle URLs - FIXME). This check
-        //     serves as a quick way to determine whether found name is
-        //     filename and not URL:
-        if (wxFileName::FileExists(fnd))
-        {
-            // Make the name absolute filename, because the app may
-            // change working directory later:
-            wxFileName fn(fnd);
-            if (fn.IsRelative())
-            {
-                fn.MakeAbsolute();
-                fnd = fn.GetFullPath();
-            }
-#if wxUSE_FILESYSTEM
-            fnd = wxFileSystem::FileNameToURL(fnd);
-#endif
-        }
+        fnd = ConvertFileNameToURL(fnd);

 
 #if wxUSE_FILESYSTEM
 
 #if wxUSE_FILESYSTEM

-        if (fnd.Lower().Matches(wxT("*.zip")) ||
-            fnd.Lower().Matches(wxT("*.xrs")))
+        if ( IsArchive(fnd) )

         {
             rt = rt && Load(fnd + wxT("#zip:*.xrc"));
         }
         {
             rt = rt && Load(fnd + wxT("#zip:*.xrc"));
         }

-        else
-#endif
+        else // a single resource URL
+#endif // wxUSE_FILESYSTEM

         {
         {

-            drec = new wxXmlResourceDataRecord;
-            drec->File = fnd;
-            m_data.Add(drec);
+            wxXmlResourceDataRecord drec;
+            drec.File = fnd;
+            Data().push_back(drec);

         }
 
         if (iswild)
         }
 
         if (iswild)


@@ -147,18 +202,58 @@ bool wxXmlResource::Load(const wxString& filemask)
     return rt && UpdateResources();
 }
 
     return rt && UpdateResources();
 }
 

+bool wxXmlResource::Unload(const wxString& filename)
+{
+    wxASSERT_MSG( !wxIsWild(filename),
+                    _T("wildcards not supported by wxXmlResource::Unload()") );
+
+    wxString fnd = ConvertFileNameToURL(filename);
+#if wxUSE_FILESYSTEM
+    const bool isArchive = IsArchive(fnd);
+    if ( isArchive )
+        fnd += _T("#zip:");
+#endif // wxUSE_FILESYSTEM
+
+    bool unloaded = false;
+    for ( wxXmlResourceDataRecords::iterator i = Data().begin();
+          i != Data().end(); ++i )
+    {
+#if wxUSE_FILESYSTEM
+        if ( isArchive )
+        {
+            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
+        {
+            if ( i->File == fnd )
+            {
+                Data().erase(i);
+                unloaded = true;
+
+                // no sense in continuing, there is only one file with this URL
+                break;
+            }
+        }
+    }
+
+    return unloaded;
+}
+

 
 IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject)
 
 void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
 {
 
 IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject)
 
 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);
 }
 


@@ -166,7 +261,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();

 }
 
 
 }
 
 


@@ -280,7 +378,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
         {


@@ -344,65 +442,74 @@ 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);
+        modif = (i->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);
-            modif = file && file->GetModificationTime() > m_data[i].Time;
+            file = fsys.OpenFile(i->File);
+#           if wxUSE_DATETIME
+            modif = file && file->GetModificationTime() > i->Time;
+#           else // wxUSE_DATETIME
+            modif = true;
+#           endif // wxUSE_DATETIME

             if (!file)
             {
             if (!file)
             {

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

                 rt = false;
             }
             wxDELETE(file);
             wxUnusedVar(file);
                 rt = false;
             }
             wxDELETE(file);
             wxUnusedVar(file);

-#           else
-            modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time;
-#           endif
+#           else // wxUSE_FILESYSTEM
+#           if wxUSE_DATETIME
+            modif = wxDateTime(wxFileModificationTime(i->File)) > i->Time;
+#           else // wxUSE_DATETIME
+            modif = true;
+#           endif // wxUSE_DATETIME
+#           endif // wxUSE_FILESYSTEM

         }
 
         if (modif)
         {
             wxLogTrace(_T("xrc"),
         }
 
         if (modif)
         {
             wxLogTrace(_T("xrc"),

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

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

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

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

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

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

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

             }
             }

-            if (!stream || !m_data[i].Doc->Load(*stream, encoding))
+            if (!stream || !i->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);
+                           i->File.c_str());
+                wxDELETE(i->Doc);

                 rt = false;
             }
                 rt = false;
             }

-            else if (m_data[i].Doc->GetRoot()->GetName() != wxT("resource"))
+            else if (i->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'."), i->File.c_str());
+                wxDELETE(i->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 = i->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)


@@ -417,12 +524,14 @@ bool wxXmlResource::UpdateResources()
                     rt = false;
                 }
 
                     rt = false;
                 }
 

-                ProcessPlatformProperty(m_data[i].Doc->GetRoot());
+                ProcessPlatformProperty(i->Doc->GetRoot());
+#if wxUSE_DATETIME

 #if wxUSE_FILESYSTEM
 #if wxUSE_FILESYSTEM

-                m_data[i].Time = file->GetModificationTime();
-#else
-                m_data[i].Time = wxDateTime(wxFileModificationTime(m_data[i].File));
-#endif
+                i->Time = file->GetModificationTime();
+#else // wxUSE_FILESYSTEM
+                i->Time = wxDateTime(wxFileModificationTime(i->File));
+#endif // wxUSE_FILESYSTEM
+#endif // wxUSE_DATETIME

             }
 
 #           if wxUSE_FILESYSTEM
             }
 
 #           if wxUSE_FILESYSTEM


@@ -453,20 +562,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;
                 }


@@ -497,17 +606,18 @@ 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 )
+        if ( f->Doc == NULL || f->Doc->GetRoot() == NULL )

             continue;
 
             continue;
 

-        wxXmlNode* found = DoFindResource(m_data[f].Doc->GetRoot(),
+        wxXmlNode* found = DoFindResource(f->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(f->File);

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


@@ -520,34 +630,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);


@@ -556,10 +667,21 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
         }
 
         if ( !dnode )
         }
 
         if ( !dnode )

-            dest.AddChild(new wxXmlNode(*node));
+        {
+            static const wxChar *AT_END = wxT("end");
+            wxString insert_pos = node->GetAttribute(wxT("insert_at"), AT_END);
+            if ( insert_pos == AT_END )
+            {
+                dest.AddChild(new wxXmlNode(*node));
+            }
+            else if ( insert_pos == wxT("begin") )
+            {
+                dest.InsertChild(new wxXmlNode(*node), dest.GetChildren());
+            }
+        }

     }
 
     }
 

-    if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().Length() )
+    if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().length() )

          dest.SetContent(with.GetContent());
 }
 
          dest.SetContent(with.GetContent());
 }
 


@@ -572,7 +694,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 )


@@ -588,8 +710,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))


@@ -599,38 +719,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


@@ -667,23 +785,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());
             }


@@ -691,7 +809,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);
 


@@ -717,17 +835,23 @@ void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
 void wxXmlResourceHandler::AddWindowStyles()
 {
     XRC_ADD_STYLE(wxCLIP_CHILDREN);
 void wxXmlResourceHandler::AddWindowStyles()
 {
     XRC_ADD_STYLE(wxCLIP_CHILDREN);

-    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);
+
+    // the border styles all have the old and new names, recognize both for now
+    XRC_ADD_STYLE(wxSIMPLE_BORDER); XRC_ADD_STYLE(wxBORDER_SIMPLE);
+    XRC_ADD_STYLE(wxSUNKEN_BORDER); XRC_ADD_STYLE(wxBORDER_SUNKEN);
+    XRC_ADD_STYLE(wxDOUBLE_BORDER); XRC_ADD_STYLE(wxBORDER_DOUBLE);
+    XRC_ADD_STYLE(wxRAISED_BORDER); XRC_ADD_STYLE(wxBORDER_RAISED);
+    XRC_ADD_STYLE(wxSTATIC_BORDER); XRC_ADD_STYLE(wxBORDER_STATIC);
+    XRC_ADD_STYLE(wxNO_BORDER);     XRC_ADD_STYLE(wxBORDER_NONE);
+

     XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
     XRC_ADD_STYLE(wxWANTS_CHARS);
     XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
     XRC_ADD_STYLE(wxWANTS_CHARS);

+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);

     XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
     XRC_ADD_STYLE(wxFULL_REPAINT_ON_RESIZE);
     XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
     XRC_ADD_STYLE(wxFULL_REPAINT_ON_RESIZE);

+    XRC_ADD_STYLE(wxALWAYS_SHOW_SB);

     XRC_ADD_STYLE(wxWS_EX_BLOCK_EVENTS);
     XRC_ADD_STYLE(wxWS_EX_BLOCK_EVENTS);

+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);

 }
 
 
 }
 
 


@@ -796,11 +920,11 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
                 case wxT('n'):
                     str2 << wxT('\n');
                     break;
                 case wxT('n'):
                     str2 << wxT('\n');
                     break;

-                    
+

                 case wxT('t'):
                     str2 << wxT('\t');
                     break;
                 case wxT('t'):
                     str2 << wxT('\t');
                     break;

-                    
+

                 case wxT('r'):
                     str2 << wxT('\r');
                     break;
                 case wxT('r'):
                     str2 << wxT('\r');
                     break;


@@ -813,7 +937,7 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
                         break;
                     }
                     // else fall-through to default: branch below
                         break;
                     }
                     // else fall-through to default: branch below

-    
+

                 default:
                     str2 << wxT('\\') << *dt;
                     break;
                 default:
                     str2 << wxT('\\') << *dt;
                     break;


@@ -824,9 +948,9 @@ 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);
+            return wxGetTranslation(str2, m_resource->GetDomain());

         }
         else
         {
         }
         else
         {


@@ -839,13 +963,11 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
 #endif
         }
     }
 #endif
         }
     }

-    else
-    {
-        // If wxXRC_USE_LOCALE is not set, then the string is already in
-        // system's default encoding in ANSI build, so we don't have to
-        // do anything special here.
-        return str2;
-    }
+
+    // If wxXRC_USE_LOCALE is not set, then the string is already in
+    // system's default encoding in ANSI build, so we don't have to
+    // do anything special here.
+    return str2;

 }
 
 
 }
 
 


@@ -860,20 +982,24 @@ long wxXmlResourceHandler::GetLong(const wxString& param, long defaultv)
 
     return value;
 }
 
     return value;
 }

-    
+

 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);

 
 

-    const char *prevlocale = setlocale(LC_NUMERIC, "C");
-    
-    if (!str1.ToDouble(&value))
-        value = defaultv;
+    // 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));

 
 

-    setlocale(LC_NUMERIC, prevlocale);
+    double value;
+    if (!str.ToDouble(&value))
+        value = defaultv;

 
 

-    return value;
+    return wx_truncate_cast(float, value);

 }
 
 
 }
 
 


@@ -886,7 +1012,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"));

 }
 
 
 }
 
 


@@ -896,7 +1022,8 @@ bool wxXmlResourceHandler::GetBool(const wxString& param, bool defaultv)
     wxString v = GetParamValue(param);
     v.MakeLower();
     if (!v) return defaultv;
     wxString v = GetParamValue(param);
     v.MakeLower();
     if (!v) return defaultv;

-    else return (v == wxT("1"));
+
+    return (v == wxT("1"));

 }
 
 
 }
 
 


@@ -949,30 +1076,30 @@ static wxColour GetSystemColour(const wxString& name)
     return wxNullColour;
 }
 
     return wxNullColour;
 }
 

-wxColour wxXmlResourceHandler::GetColour(const wxString& param)
+wxColour wxXmlResourceHandler::GetColour(const wxString& param, const wxColour& defaultv)

 {
     wxString v = GetParamValue(param);
 
 {
     wxString v = GetParamValue(param);
 

-    // find colour using HTML syntax (#RRGGBB)
-    unsigned long tmp = 0;
+    if ( v.empty() )
+        return defaultv;
+
+    wxColour clr;

 
 

-    if (v.Length() != 7 || v[0u] != wxT('#') ||
-        wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1)
+    // wxString -> wxColour conversion
+    if (!clr.Set(v))

     {
         // the colour doesn't use #RRGGBB format, check if it is symbolic
         // colour name:
     {
         // the colour doesn't use #RRGGBB format, check if it is symbolic
         // colour name:

-        wxColour clr = GetSystemColour(v);
+        clr = GetSystemColour(v);

         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;
     }
 

-    return wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
-                    (unsigned char) ((tmp & 0x00FF00) >> 8),
-                    (unsigned char) ((tmp & 0x0000FF)));
+    return clr;

 }
 
 
 }
 
 


@@ -985,15 +1112,15 @@ 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
                 scl = wxART_MAKE_CLIENT_ID_FROM_STR(scl);
             if (scl.empty())
                 scl = defaultArtClient;
             else
                 scl = wxART_MAKE_CLIENT_ID_FROM_STR(scl);

-            
+

             wxBitmap stockArt =
                 wxArtProvider::GetBitmap(wxART_MAKE_ART_ID_FROM_STR(sid),
                                          scl, size);
             wxBitmap stockArt =
                 wxArtProvider::GetBitmap(wxART_MAKE_ART_ID_FROM_STR(sid),
                                          scl, size);


@@ -1004,9 +1131,9 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
 
     /* ...or load the bitmap from file: */
     wxString name = GetParamValue(param);
 
     /* ...or load the bitmap from file: */
     wxString name = GetParamValue(param);

-    if (name.IsEmpty()) return wxNullBitmap;
+    if (name.empty()) return wxNullBitmap;

 #if wxUSE_FILESYSTEM
 #if wxUSE_FILESYSTEM

-    wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
+    wxFSFile *fsfile = GetCurFileSystem().OpenFile(name, wxFS_READ | wxFS_SEEKABLE);

     if (fsfile == NULL)
     {
         wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),
     if (fsfile == NULL)
     {
         wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),


@@ -1016,19 +1143,51 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
     wxImage img(*(fsfile->GetStream()));
     delete fsfile;
 #else
     wxImage img(*(fsfile->GetStream()));
     delete fsfile;
 #else

-    wxImage img(GetParamValue(wxT("bitmap")));
+    wxImage img(name);

 #endif
 
     if (!img.Ok())
     {
         wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),
 #endif
 
     if (!img.Ok())
     {
         wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),

-                   param.c_str());
+                   name.c_str());

         return wxNullBitmap;
     }
     if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
     return wxBitmap(img);
         return wxNullBitmap;
     }
     if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
     return wxBitmap(img);

+}
+
+#if wxUSE_ANIMATIONCTRL
+wxAnimation wxXmlResourceHandler::GetAnimation(const wxString& param)
+{
+    wxAnimation ani;
+
+    /* load the animation from file: */
+    wxString name = GetParamValue(param);
+    if (name.empty()) return wxNullAnimation;
+#if wxUSE_FILESYSTEM
+    wxFSFile *fsfile = GetCurFileSystem().OpenFile(name, wxFS_READ | wxFS_SEEKABLE);
+    if (fsfile == NULL)
+    {
+        wxLogError(_("XRC resource: Cannot create animation from '%s'."),
+                   name.c_str());
+        return wxNullAnimation;
+    }
+    ani.Load(*(fsfile->GetStream()));
+    delete fsfile;
+#else
+    ani.LoadFile(name);
+#endif

 
 

+    if (!ani.IsOk())
+    {
+        wxLogError(_("XRC resource: Cannot create animation from '%s'."),
+                   name.c_str());
+        return wxNullAnimation;
+    }
+
+    return ani;

 }
 }

+#endif      // wxUSE_ANIMATIONCTRL

 
 
 
 
 
 


@@ -1059,6 +1218,14 @@ wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param)
 }
 
 
 }
 
 

+
+bool wxXmlResourceHandler::IsOfClass(wxXmlNode *node, const wxString& classname)
+{
+    return node->GetAttribute(wxT("class"), wxEmptyString) == classname;
+}
+
+
+

 wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
 {
     wxXmlNode *n = node;
 wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
 {
     wxXmlNode *n = node;


@@ -1079,7 +1246,7 @@ wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
 
 wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
 {
 
 wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
 {

-    if (param.IsEmpty())
+    if (param.empty())

         return GetNodeContent(m_node);
     else
         return GetNodeContent(GetParamNode(param));
         return GetNodeContent(m_node);
     else
         return GetNodeContent(GetParamNode(param));


@@ -1087,14 +1254,15 @@ wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
 
 
 
 
 
 

-wxSize wxXmlResourceHandler::GetSize(const wxString& param)
+wxSize wxXmlResourceHandler::GetSize(const wxString& param,
+                                     wxWindow *windowToUse)

 {
     wxString s = GetParamValue(param);
 {
     wxString s = GetParamValue(param);

-    if (s.IsEmpty()) s = wxT("-1,-1");
+    if (s.empty()) s = wxT("-1,-1");

     bool is_dlg;
     long sx, sy = 0;
 
     bool is_dlg;
     long sx, sy = 0;
 

-    is_dlg = s[s.Length()-1] == wxT('d');
+    is_dlg = s[s.length()-1] == wxT('d');

     if (is_dlg) s.RemoveLast();
 
     if (!s.BeforeFirst(wxT(',')).ToLong(&sx) ||
     if (is_dlg) s.RemoveLast();
 
     if (!s.BeforeFirst(wxT(',')).ToLong(&sx) ||


@@ -1106,15 +1274,22 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param)
 
     if (is_dlg)
     {
 
     if (is_dlg)
     {

-        if (m_parentAsWindow)
+        if (windowToUse)
+        {
+            return wxDLG_UNIT(windowToUse, wxSize(sx, sy));
+        }
+        else if (m_parentAsWindow)
+        {

             return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, sy));
             return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, sy));

+        }

         else
         {
             wxLogError(_("Cannot convert dialog units: dialog unknown."));
             return wxDefaultSize;
         }
     }
         else
         {
             wxLogError(_("Cannot convert dialog units: dialog unknown."));
             return wxDefaultSize;
         }
     }

-    else return wxSize(sx, sy);
+
+    return wxSize(sx, sy);

 }
 
 
 }
 
 


@@ -1127,14 +1302,16 @@ wxPoint wxXmlResourceHandler::GetPosition(const wxString& param)
 
 
 
 
 
 

-wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaultv)
+wxCoord wxXmlResourceHandler::GetDimension(const wxString& param,
+                                           wxCoord defaultv,
+                                           wxWindow *windowToUse)

 {
     wxString s = GetParamValue(param);
 {
     wxString s = GetParamValue(param);

-    if (s.IsEmpty()) return defaultv;
+    if (s.empty()) return defaultv;

     bool is_dlg;
     long sx;
 
     bool is_dlg;
     long sx;
 

-    is_dlg = s[s.Length()-1] == wxT('d');
+    is_dlg = s[s.length()-1] == wxT('d');

     if (is_dlg) s.RemoveLast();
 
     if (!s.ToLong(&sx))
     if (is_dlg) s.RemoveLast();
 
     if (!s.ToLong(&sx))


@@ -1145,15 +1322,22 @@ wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaul
 
     if (is_dlg)
     {
 
     if (is_dlg)
     {

-        if (m_parentAsWindow)
+        if (windowToUse)
+        {
+            return wxDLG_UNIT(windowToUse, wxSize(sx, 0)).x;
+        }
+        else if (m_parentAsWindow)
+        {

             return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, 0)).x;
             return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, 0)).x;

+        }

         else
         {
             wxLogError(_("Cannot convert dialog units: dialog unknown."));
             return defaultv;
         }
     }
         else
         {
             wxLogError(_("Cannot convert dialog units: dialog unknown."));
             return defaultv;
         }
     }

-    else return sx;
+
+    return sx;

 }
 
 
 }
 
 


@@ -1193,10 +1377,10 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     // font attributes:
 
     // size
     // font attributes:
 
     // size

-    int isize = wxDEFAULT;
+    int isize = -1;

     bool hasSize = HasParam(wxT("size"));
     bool hasSize = HasParam(wxT("size"));

-    if (hasSize) 
-        isize = GetLong(wxT("size"), wxDEFAULT);
+    if (hasSize)
+        isize = GetLong(wxT("size"), -1);

 
     // style
     int istyle = wxNORMAL;
 
     // style
     int istyle = wxNORMAL;


@@ -1204,9 +1388,9 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     if (hasStyle)
     {
         wxString style = GetParamValue(wxT("style"));
     if (hasStyle)
     {
         wxString style = GetParamValue(wxT("style"));

-        if (style == wxT("italic")) 
+        if (style == wxT("italic"))

             istyle = wxITALIC;
             istyle = wxITALIC;

-        else if (style == wxT("slant")) 
+        else if (style == wxT("slant"))

             istyle = wxSLANT;
     }
 
             istyle = wxSLANT;
     }
 


@@ -1216,12 +1400,12 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     if (hasWeight)
     {
         wxString weight = GetParamValue(wxT("weight"));
     if (hasWeight)
     {
         wxString weight = GetParamValue(wxT("weight"));

-        if (weight == wxT("bold")) 
+        if (weight == wxT("bold"))

             iweight = wxBOLD;
             iweight = wxBOLD;

-        else if (weight == wxT("light")) 
+        else if (weight == wxT("light"))

             iweight = wxLIGHT;
     }
             iweight = wxLIGHT;
     }

-   
+

     // underline
     bool hasUnderlined = HasParam(wxT("underlined"));
     bool underlined = hasUnderlined ? GetBool(wxT("underlined"), false) : false;
     // underline
     bool hasUnderlined = HasParam(wxT("underlined"));
     bool underlined = hasUnderlined ? GetBool(wxT("underlined"), false) : false;


@@ -1239,22 +1423,21 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
         else if (family == wxT("modern")) ifamily = wxMODERN;
         else if (family == wxT("teletype")) ifamily = wxTELETYPE;
     }
         else if (family == wxT("modern")) ifamily = wxMODERN;
         else if (family == wxT("teletype")) ifamily = wxTELETYPE;
     }

-    
-    
+
+

     wxString facename;
     bool hasFacename = HasParam(wxT("face"));
     if (hasFacename)
     {
         wxString faces = GetParamValue(wxT("face"));
     wxString facename;
     bool hasFacename = HasParam(wxT("face"));
     if (hasFacename)
     {
         wxString faces = GetParamValue(wxT("face"));

-        wxFontEnumerator enu;
-        enu.EnumerateFacenames();
+        wxArrayString facenames(wxFontEnumerator::GetFacenames());

         wxStringTokenizer tk(faces, wxT(","));
         while (tk.HasMoreTokens())
         {
         wxStringTokenizer tk(faces, wxT(","));
         while (tk.HasMoreTokens())
         {

-            int index = enu.GetFacenames()->Index(tk.GetNextToken(), false);
+            int index = facenames.Index(tk.GetNextToken(), false);

             if (index != wxNOT_FOUND)
             {
             if (index != wxNOT_FOUND)
             {

-                facename = (*enu.GetFacenames())[index];
+                facename = facenames[index];

                 break;
             }
         }
                 break;
             }
         }


@@ -1267,45 +1450,45 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     {
         wxString encoding = GetParamValue(wxT("encoding"));
         wxFontMapper mapper;
     {
         wxString encoding = GetParamValue(wxT("encoding"));
         wxFontMapper mapper;

-        if (!encoding.IsEmpty())
+        if (!encoding.empty())

             enc = mapper.CharsetToEncoding(encoding);
         if (enc == wxFONTENCODING_SYSTEM)
             enc = wxFONTENCODING_DEFAULT;
     }
 
     // is this font based on a system font?
             enc = mapper.CharsetToEncoding(encoding);
         if (enc == wxFONTENCODING_SYSTEM)
             enc = wxFONTENCODING_DEFAULT;
     }
 
     // is this font based on a system font?

-    wxFont sysfont = GetSystemFont(GetParamValue(wxT("sysfont")));
-    
-    if (sysfont.Ok())
+    wxFont font = GetSystemFont(GetParamValue(wxT("sysfont")));
+
+    if (font.Ok())

     {
     {

-        if (hasSize)
-            sysfont.SetPointSize(isize);
+        if (hasSize && isize != -1)
+            font.SetPointSize(isize);

         else if (HasParam(wxT("relativesize")))
         else if (HasParam(wxT("relativesize")))

-            sysfont.SetPointSize(int(sysfont.GetPointSize() *
+            font.SetPointSize(int(font.GetPointSize() *

                                      GetFloat(wxT("relativesize"))));
                                      GetFloat(wxT("relativesize"))));

-        
+

         if (hasStyle)
         if (hasStyle)

-            sysfont.SetStyle(istyle);
+            font.SetStyle(istyle);

         if (hasWeight)
         if (hasWeight)

-            sysfont.SetWeight(iweight);
+            font.SetWeight(iweight);

         if (hasUnderlined)
         if (hasUnderlined)

-            sysfont.SetUnderlined(underlined);
+            font.SetUnderlined(underlined);

         if (hasFamily)
         if (hasFamily)

-            sysfont.SetFamily(ifamily);
+            font.SetFamily(ifamily);

         if (hasFacename)
         if (hasFacename)

-            sysfont.SetFaceName(facename);
+            font.SetFaceName(facename);

         if (hasEncoding)
         if (hasEncoding)

-            sysfont.SetDefaultEncoding(enc);
-
-        m_node = oldnode;
-        return sysfont;
+            font.SetDefaultEncoding(enc);

     }
     }

-    else
+    else // not based on system font

     {
     {

-        m_node = oldnode;
-        return wxFont(isize, ifamily, istyle, iweight,
+        font = wxFont(isize == -1 ? wxNORMAL_FONT->GetPointSize() : isize,
+                      ifamily, istyle, iweight,

                       underlined, facename, enc);
     }
                       underlined, facename, enc);
     }

+
+    m_node = oldnode;
+    return font;

 }
 
 
 }
 
 


@@ -1334,6 +1517,8 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
 #endif
     if (HasParam(wxT("font")))
         wnd->SetFont(GetFont());
 #endif
     if (HasParam(wxT("font")))
         wnd->SetFont(GetFont());

+    if (HasParam(wxT("help")))
+        wnd->SetHelpText(GetText(wxT("help")));

 }
 
 
 }
 
 


@@ -1384,17 +1569,17 @@ void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode *
 struct XRCID_record
 {
     int id;
 struct XRCID_record
 {
     int id;

-    wxChar *key;
+    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 = -2)
+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;


@@ -1413,8 +1598,8 @@ static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
     (*rec_var)->key = wxStrdup(str_id);
     (*rec_var)->next = NULL;
 
     (*rec_var)->key = wxStrdup(str_id);
     (*rec_var)->next = NULL;
 

-    wxChar *end;
-    if (value_if_not_found != -2)
+    char *end;
+    if (value_if_not_found != wxID_NONE)

         (*rec_var)->id = value_if_not_found;
     else
     {
         (*rec_var)->id = value_if_not_found;
     else
     {


@@ -1426,16 +1611,27 @@ static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)
         }
         else
         {
         }
         else
         {

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

         }
     }
 
     return (*rec_var)->id;
 }
 
         }
     }
 
     return (*rec_var)->id;
 }
 

-/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
+static void AddStdXRCID_Records();
+
+/*static*/
+int wxXmlResource::DoGetXRCID(const char *str_id, int value_if_not_found)

 {
 {

-    return XRCID_Lookup(str_id);
+    static bool s_stdIDsAdded = false;
+
+    if ( !s_stdIDsAdded )
+    {
+        s_stdIDsAdded = true;
+        AddStdXRCID_Records();
+    }
+
+    return XRCID_Lookup(str_id, value_if_not_found);

 }
 
 
 }
 
 


@@ -1444,6 +1640,12 @@ static void CleanXRCID_Record(XRCID_record *rec)
     if (rec)
     {
         CleanXRCID_Record(rec->next);
     if (rec)
     {
         CleanXRCID_Record(rec->next);

+
+        // if we had generated the value of this id automatically, release it
+        // now that we don't need it any longer
+        if ( wxWindow::IsAutoGeneratedId(rec->id) )
+            wxWindow::ReleaseControlId(rec->id);
+

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


@@ -1460,12 +1662,12 @@ 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(wxID_SEPARATOR);
     stdID(-1);
 
     stdID(wxID_ANY);
     stdID(wxID_SEPARATOR);

-    
+

     stdID(wxID_OPEN);
     stdID(wxID_CLOSE);
     stdID(wxID_NEW);
     stdID(wxID_OPEN);
     stdID(wxID_CLOSE);
     stdID(wxID_NEW);


@@ -1478,6 +1680,7 @@ static void AddStdXRCID_Records()
     stdID(wxID_HELP);
     stdID(wxID_PRINT);
     stdID(wxID_PRINT_SETUP);
     stdID(wxID_HELP);
     stdID(wxID_PRINT);
     stdID(wxID_PRINT_SETUP);

+    stdID(wxID_PAGE_SETUP);

     stdID(wxID_PREVIEW);
     stdID(wxID_ABOUT);
     stdID(wxID_HELP_CONTENTS);
     stdID(wxID_PREVIEW);
     stdID(wxID_ABOUT);
     stdID(wxID_HELP_CONTENTS);


@@ -1579,7 +1782,6 @@ public:
     wxXmlResourceModule() {}
     bool OnInit()
     {
     wxXmlResourceModule() {}
     bool OnInit()
     {

-        AddStdXRCID_Records();

         wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX);
         return true;
     }
         wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX);
         return true;
     }


@@ -1587,8 +1789,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();
     }
 };