Compilo.

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

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 33a33edc34ddc720bcb6bbac9bdf577909e500a7..197ea98480f8dd9c55fe235a3467313e12f2ffa0 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -19,11 +19,14 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/dialog.h"
 #include "wx/panel.h"
 #include "wx/frame.h"
 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/dialog.h"
 #include "wx/panel.h"
 #include "wx/frame.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/log.h"
 #include "wx/intl.h"
 #include "wx/tokenzr.h"


@@ -32,8 +35,9 @@
 #include "wx/bitmap.h"
 #include "wx/image.h"
 #include "wx/fontmap.h"
 #include "wx/bitmap.h"
 #include "wx/image.h"
 #include "wx/fontmap.h"

+#include "wx/artprov.h"

 
 

-#include "wx/xrc/xml.h"
+#include "wx/xml/xml.h"

 #include "wx/xrc/xmlres.h"
 
 #include "wx/arrimpl.cpp"
 #include "wx/xrc/xmlres.h"
 
 #include "wx/arrimpl.cpp"


@@ -58,7 +62,6 @@ wxXmlResource *wxXmlResource::ms_instance = NULL;
 
 wxXmlResource::wxXmlResource(int flags)
 {
 
 wxXmlResource::wxXmlResource(int flags)
 {

-    m_handlers.DeleteContents(TRUE);

     m_flags = flags;
     m_version = -1;
 }
     m_flags = flags;
     m_version = -1;
 }


@@ -67,7 +70,6 @@ wxXmlResource::wxXmlResource(const wxString& filemask, int flags)
 {
     m_flags = flags;
     m_version = -1;
 {
     m_flags = flags;
     m_version = -1;

-    m_handlers.DeleteContents(TRUE);

     Load(filemask);
 }
 
     Load(filemask);
 }
 


@@ -82,7 +84,7 @@ bool wxXmlResource::Load(const wxString& filemask)
     wxString fnd;
     wxXmlResourceDataRecord *drec;
     bool iswild = wxIsWild(filemask);
     wxString fnd;
     wxXmlResourceDataRecord *drec;
     bool iswild = wxIsWild(filemask);

-    bool rt = TRUE;
+    bool rt = true;

 
 #if wxUSE_FILESYSTEM
     wxFileSystem fsys;
 
 #if wxUSE_FILESYSTEM
     wxFileSystem fsys;


@@ -98,11 +100,30 @@ bool wxXmlResource::Load(const wxString& filemask)
         fnd = filemask;
     while (!!fnd)
     {
         fnd = filemask;
     while (!!fnd)
     {

+        // 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
 #if wxUSE_FILESYSTEM

-        if (filemask.Lower().Matches(wxT("*.zip")) ||
-            filemask.Lower().Matches(wxT("*.xrs")))
+            fnd = wxFileSystem::FileNameToURL(fnd);
+#endif
+        }
+
+#if wxUSE_FILESYSTEM
+        if (fnd.Lower().Matches(wxT("*.zip")) ||
+            fnd.Lower().Matches(wxT("*.xrs")))

         {
         {

-            rt = rt && Load(fnd + wxT("#zip:*.xmlbin"));

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


@@ -120,10 +141,11 @@ bool wxXmlResource::Load(const wxString& filemask)
     }
 #   undef wxXmlFindFirst
 #   undef wxXmlFindNext
     }
 #   undef wxXmlFindFirst
 #   undef wxXmlFindNext

-    return rt;
+    return rt && UpdateResources();

 }
 
 
 }
 
 

+IMPLEMENT_ABSTRACT_CLASS(wxXmlResourceHandler, wxObject)

 
 void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
 {
 
 void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
 {


@@ -131,15 +153,20 @@ void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
     handler->SetParentResource(this);
 }
 
     handler->SetParentResource(this);
 }
 

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

 
 
 void wxXmlResource::ClearHandlers()
 {
 
 
 void wxXmlResource::ClearHandlers()
 {

-    m_handlers.Clear();
+    WX_CLEAR_LIST(wxList, m_handlers);

 }
 
 
 }
 
 

-

 wxMenu *wxXmlResource::LoadMenu(const wxString& name)
 {
     return (wxMenu*)CreateResFromNode(FindResource(name, wxT("wxMenu")), NULL, NULL);
 wxMenu *wxXmlResource::LoadMenu(const wxString& name)
 {
     return (wxMenu*)CreateResFromNode(FindResource(name, wxT("wxMenu")), NULL, NULL);


@@ -164,10 +191,7 @@ wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name)
 
 wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name)
 {
 
 wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name)
 {

-    wxDialog *dialog = new wxDialog;
-    if (!LoadDialog(dialog, parent, name))
-        { delete dialog; return NULL; }
-    else return dialog;
+    return (wxDialog*)CreateResFromNode(FindResource(name, wxT("wxDialog")), parent, NULL);

 }
 
 bool wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name)
 }
 
 bool wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name)


@@ -187,6 +211,11 @@ bool wxXmlResource::LoadPanel(wxPanel *panel, wxWindow *parent, const wxString&
     return CreateResFromNode(FindResource(name, wxT("wxPanel")), parent, panel) != NULL;
 }
 
     return CreateResFromNode(FindResource(name, wxT("wxPanel")), parent, panel) != NULL;
 }
 

+wxFrame *wxXmlResource::LoadFrame(wxWindow* parent, const wxString& name)
+{
+    return (wxFrame*)CreateResFromNode(FindResource(name, wxT("wxFrame")), parent, NULL);
+}
+

 bool wxXmlResource::LoadFrame(wxFrame* frame, wxWindow *parent, const wxString& name)
 {
     return CreateResFromNode(FindResource(name, wxT("wxFrame")), parent, frame) != NULL;
 bool wxXmlResource::LoadFrame(wxFrame* frame, wxWindow *parent, const wxString& name)
 {
     return CreateResFromNode(FindResource(name, wxT("wxFrame")), parent, frame) != NULL;


@@ -212,6 +241,18 @@ wxIcon wxXmlResource::LoadIcon(const wxString& name)
     return rt;
 }
 
     return rt;
 }
 

+
+wxObject *wxXmlResource::LoadObject(wxWindow *parent, const wxString& name, const wxString& classname)
+{
+    return CreateResFromNode(FindResource(name, classname), parent, NULL);
+}
+
+bool wxXmlResource::LoadObject(wxObject *instance, wxWindow *parent, const wxString& name, const wxString& classname)
+{
+    return CreateResFromNode(FindResource(name, classname), parent, instance) != NULL;
+}
+
+

 bool wxXmlResource::AttachUnknownControl(const wxString& name,
                                          wxWindow *control, wxWindow *parent)
 {
 bool wxXmlResource::AttachUnknownControl(const wxString& name,
                                          wxWindow *control, wxWindow *parent)
 {


@@ -221,7 +262,7 @@ bool wxXmlResource::AttachUnknownControl(const wxString& name,
     if (!container)
     {
         wxLogError(_("Cannot find container for unknown control '%s'."), name.c_str());
     if (!container)
     {
         wxLogError(_("Cannot find container for unknown control '%s'."), name.c_str());

-        return FALSE;
+        return false;

     }
     return control->Reparent(container);
 }
     }
     return control->Reparent(container);
 }


@@ -235,29 +276,30 @@ static void ProcessPlatformProperty(wxXmlNode *node)
     wxXmlNode *c = node->GetChildren();
     while (c)
     {
     wxXmlNode *c = node->GetChildren();
     while (c)
     {

-        isok = FALSE;
+        isok = false;

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

-            isok = TRUE;
+            isok = true;

         else
         {
         else
         {

-            wxStringTokenizer tkn(s, " |");
+            wxStringTokenizer tkn(s, wxT(" |"));

 
             while (tkn.HasMoreTokens())
             {
                 s = tkn.GetNextToken();
 
             while (tkn.HasMoreTokens())
             {
                 s = tkn.GetNextToken();

-                if (
-#ifdef __WXMSW__
-                    s == wxString(wxT("win"))
+#ifdef __WINDOWS__
+                if (s == wxT("win")) isok = true;
+#endif
+#if defined(__MAC__) || defined(__APPLE__)
+                if (s == wxT("mac")) isok = true;

 #elif defined(__UNIX__)
 #elif defined(__UNIX__)

-                    s == wxString(wxT("unix"))
-#elif defined(__MAC__)
-                    s == wxString(wxT("mac"))
-#elif defined(__OS2__)
-                    s == wxString(wxT("os2"))
-#else
-                    FALSE
+                if (s == wxT("unix")) isok = true;

 #endif
 #endif

-              ) isok = TRUE;
+#ifdef __OS2__
+                if (s == wxT("os2")) isok = true;
+#endif
+
+                if (isok)
+                    break;

             }
         }
 
             }
         }
 


@@ -268,8 +310,8 @@ static void ProcessPlatformProperty(wxXmlNode *node)
         }
         else
         {
         }
         else
         {

-            node->RemoveChild(c);

             wxXmlNode *c2 = c->GetNext();
             wxXmlNode *c2 = c->GetNext();

+            node->RemoveChild(c);

             delete c;
             c = c2;
         }
             delete c;
             c = c2;
         }


@@ -278,11 +320,13 @@ static void ProcessPlatformProperty(wxXmlNode *node)
 
 
 
 
 
 

-void wxXmlResource::UpdateResources()
+bool wxXmlResource::UpdateResources()

 {
 {

+    bool rt = true;

     bool modif;
 #   if wxUSE_FILESYSTEM
     wxFSFile *file = NULL;
     bool modif;
 #   if wxUSE_FILESYSTEM
     wxFSFile *file = NULL;

+    wxUnusedVar(file);

     wxFileSystem fsys;
 #   endif
 
     wxFileSystem fsys;
 #   endif
 


@@ -290,9 +334,9 @@ void wxXmlResource::UpdateResources()
 #if !wxUSE_UNICODE && wxUSE_INTL
     if ( (GetFlags() & wxXRC_USE_LOCALE) == 0 )
     {
 #if !wxUSE_UNICODE && wxUSE_INTL
     if ( (GetFlags() & wxXRC_USE_LOCALE) == 0 )
     {

-        // In case we are not using wxLocale to translate strings, convert the strings
-        // GUI's charset. This must not be done when wxXRC_USE_LOCALE is on, because
-        // it could break wxGetTranslation lookup.
+        // In case we are not using wxLocale to translate strings, convert the
+        // strings GUI's charset. This must not be done when wxXRC_USE_LOCALE
+        // is on, because it could break wxGetTranslation lookup.

         encoding = wxLocale::GetSystemEncodingName();
     }
 #endif
         encoding = wxLocale::GetSystemEncodingName();
     }
 #endif


@@ -301,14 +345,18 @@ void wxXmlResource::UpdateResources()
     {
         modif = (m_data[i].Doc == NULL);
 
     {
         modif = (m_data[i].Doc == NULL);
 

-        if (!modif)
+        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;
             if (!file)
         {
 #           if wxUSE_FILESYSTEM
             file = fsys.OpenFile(m_data[i].File);
             modif = file && file->GetModificationTime() > m_data[i].Time;
             if (!file)

+            {

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

+                rt = false;
+            }

             wxDELETE(file);
             wxDELETE(file);

+            wxUnusedVar(file);

 #           else
             modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time;
 #           endif
 #           else
             modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time;
 #           endif


@@ -316,12 +364,15 @@ void wxXmlResource::UpdateResources()
 
         if (modif)
         {
 
         if (modif)
         {

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

             wxInputStream *stream = NULL;
 
 #           if wxUSE_FILESYSTEM
             file = fsys.OpenFile(m_data[i].File);
             wxInputStream *stream = NULL;
 
 #           if wxUSE_FILESYSTEM
             file = fsys.OpenFile(m_data[i].File);

-                       if (file)
-                               stream = file->GetStream();
+            if (file)
+                stream = file->GetStream();

 #           else
             stream = new wxFileInputStream(m_data[i].File);
 #           endif
 #           else
             stream = new wxFileInputStream(m_data[i].File);
 #           endif


@@ -336,14 +387,16 @@ void wxXmlResource::UpdateResources()
                 wxLogError(_("Cannot load resources from file '%s'."),
                            m_data[i].File.c_str());
                 wxDELETE(m_data[i].Doc);
                 wxLogError(_("Cannot load resources from file '%s'."),
                            m_data[i].File.c_str());
                 wxDELETE(m_data[i].Doc);

+                rt = false;

             }
             else if (m_data[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);
             }
             else if (m_data[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);

+                rt = false;

             }
             else
             }
             else

-                       {
+            {

                 long version;
                 int v1, v2, v3, v4;
                 wxString verstr = m_data[i].Doc->GetRoot()->GetPropVal(
                 long version;
                 int v1, v2, v3, v4;
                 wxString verstr = m_data[i].Doc->GetRoot()->GetPropVal(


@@ -356,19 +409,29 @@ void wxXmlResource::UpdateResources()
                 if (m_version == -1)
                     m_version = version;
                 if (m_version != version)
                 if (m_version == -1)
                     m_version = version;
                 if (m_version != version)

+                {

                     wxLogError(_("Resource files must have same version number!"));
                     wxLogError(_("Resource files must have same version number!"));

+                    rt = false;
+                }

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

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

 
 #           if wxUSE_FILESYSTEM
 
 #           if wxUSE_FILESYSTEM

-                               wxDELETE(file);
+                wxDELETE(file);
+                wxUnusedVar(file);

 #           else
 #           else

-                               wxDELETE(stream);
+                wxDELETE(stream);

 #           endif
         }
     }
 #           endif
         }
     }

+
+    return rt;

 }
 
 
 }
 
 


@@ -387,10 +450,25 @@ 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")) &&

-                (!classname ||
-                 node->GetPropVal(wxT("class"), wxEmptyString) == classname) &&
-                node->GetPropVal(wxT("name"), &dummy) && dummy == name )
-            return node;
+             node->GetPropVal(wxT("name"), &dummy) && dummy == name )
+        {
+            wxString cls(node->GetPropVal(wxT("class"), wxEmptyString));
+            if (!classname || cls == classname)
+                return node;
+            // object_ref may not have 'class' property:
+            if (cls.empty() && node->GetName() == wxT("object_ref"))
+            {
+                wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);
+                if (refName.empty())
+                    continue;
+                wxXmlNode* refNode = FindResource(refName, wxEmptyString, true);
+                if (refNode &&
+                    refNode->GetPropVal(wxT("class"), wxEmptyString) == classname)
+                {
+                    return node;
+                }
+            }
+        }

     }
 
     if ( recursive )
     }
 
     if ( recursive )


@@ -400,7 +478,7 @@ wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent,
                  (node->GetName() == wxT("object") ||
                   node->GetName() == wxT("object_ref")) )
             {
                  (node->GetName() == wxT("object") ||
                   node->GetName() == wxT("object_ref")) )
             {

-                wxXmlNode* found = DoFindResource(node, name, classname, TRUE);
+                wxXmlNode* found = DoFindResource(node, name, classname, true);

                 if ( found )
                     return found;
             }
                 if ( found )
                     return found;
             }


@@ -466,7 +544,7 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
         for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() )
         {
             if ( dnode->GetName() == node->GetName() &&
         for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() )
         {
             if ( dnode->GetName() == node->GetName() &&

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

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


@@ -482,7 +560,9 @@ static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
          dest.SetContent(with.GetContent());
 }
 
          dest.SetContent(with.GetContent());
 }
 

-wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance)
+wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent,
+                                           wxObject *instance,
+                                           wxXmlResourceHandler *handlerToUse)

 {
     if (node == NULL) return NULL;
 
 {
     if (node == NULL) return NULL;
 


@@ -490,7 +570,7 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx
     if ( node->GetName() == wxT("object_ref") )
     {
         wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);
     if ( node->GetName() == wxT("object_ref") )
     {
         wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);

-        wxXmlNode* refNode = FindResource(refName, wxEmptyString, TRUE);
+        wxXmlNode* refNode = FindResource(refName, wxEmptyString, true);

 
         if ( !refNode )
         {
 
         if ( !refNode )
         {


@@ -506,17 +586,26 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx
     }
 
     wxXmlResourceHandler *handler;
     }
 
     wxXmlResourceHandler *handler;

-    wxObject *ret;
-    wxNode * ND = m_handlers.GetFirst();
-    while (ND)
+
+    if (handlerToUse)
+    {
+        if (handlerToUse->CanHandle(node))
+        {
+            return handlerToUse->CreateResource(node, parent, instance);
+        }
+    }
+    else if (node->GetName() == wxT("object"))

     {
     {

-        handler = (wxXmlResourceHandler*)ND->GetData();
-        if (node->GetName() == wxT("object") && handler->CanHandle(node))
+        wxList::compatibility_iterator ND = m_handlers.GetFirst();
+        while (ND)

         {
         {

-            ret = handler->CreateResource(node, parent, instance);
-            if (ret) return ret;
+            handler = (wxXmlResourceHandler*)ND->GetData();
+            if (handler->CanHandle(node))
+            {
+                return handler->CreateResource(node, parent, instance);
+            }
+            ND = ND->GetNext();

         }
         }

-        ND = ND->GetNext();

     }
 
     wxLogError(_("No handler found for XML node '%s', class '%s'!"),
     }
 
     wxLogError(_("No handler found for XML node '%s', class '%s'!"),


@@ -526,6 +615,39 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx
 }
 
 
 }
 
 

+#include "wx/listimpl.cpp"
+WX_DECLARE_LIST(wxXmlSubclassFactory, wxXmlSubclassFactoriesList);
+WX_DEFINE_LIST(wxXmlSubclassFactoriesList);
+
+wxXmlSubclassFactoriesList *wxXmlResource::ms_subclassFactories = NULL;
+
+/*static*/ void wxXmlResource::AddSubclassFactory(wxXmlSubclassFactory *factory)
+{
+    if (!ms_subclassFactories)
+    {
+        ms_subclassFactories = new wxXmlSubclassFactoriesList;
+    }
+    ms_subclassFactories->Append(factory);
+}
+
+class wxXmlSubclassFactoryCXX : public wxXmlSubclassFactory
+{
+public:
+    ~wxXmlSubclassFactoryCXX() {}
+
+    wxObject *Create(const wxString& className)
+    {
+        wxClassInfo* classInfo = wxClassInfo::FindClass(className);
+
+        if (classInfo)
+            return classInfo->CreateObject();
+        else
+            return NULL;
+    }
+};
+
+
+

 
 
 wxXmlResourceHandler::wxXmlResourceHandler()
 
 
 wxXmlResourceHandler::wxXmlResourceHandler()


@@ -547,18 +669,23 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
         !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING))
     {
         wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString);
         !(m_resource->GetFlags() & wxXRC_NO_SUBCLASSING))
     {
         wxString subclass = node->GetPropVal(wxT("subclass"), wxEmptyString);

-        wxClassInfo* classInfo = wxClassInfo::FindClass(subclass);
-
-        if (classInfo)
-            m_instance = classInfo->CreateObject();
-
-        if (!m_instance)
+        if (!subclass.empty())

         {
         {

-            wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"),
-                       subclass.c_str(), node->GetPropVal(wxT("name"), wxEmptyString).c_str());
-        }
+            for (wxXmlSubclassFactoriesList::compatibility_iterator i = wxXmlResource::ms_subclassFactories->GetFirst();
+                 i; i = i->GetNext())
+            {
+                m_instance = i->GetData()->Create(subclass);
+                if (m_instance)
+                    break;
+            }

 
 

-        m_instance = classInfo->CreateObject();
+            if (!m_instance)
+            {
+                wxString name = node->GetPropVal(wxT("name"), wxEmptyString);
+                wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"),
+                           subclass.c_str(), name.c_str());
+            }
+        }

     }
 
     m_node = node;
     }
 
     m_node = node;


@@ -588,6 +715,7 @@ void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
 
 void wxXmlResourceHandler::AddWindowStyles()
 {
 
 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(wxSIMPLE_BORDER);
     XRC_ADD_STYLE(wxSUNKEN_BORDER);
     XRC_ADD_STYLE(wxDOUBLE_BORDER);


@@ -597,6 +725,8 @@ void wxXmlResourceHandler::AddWindowStyles()
     XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
     XRC_ADD_STYLE(wxWANTS_CHARS);
     XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
     XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
     XRC_ADD_STYLE(wxWANTS_CHARS);
     XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);

+    XRC_ADD_STYLE(wxFULL_REPAINT_ON_RESIZE);
+    XRC_ADD_STYLE(wxWS_EX_BLOCK_EVENTS);

 }
 
 
 }
 
 


@@ -613,7 +743,7 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults)
 
     if (!s) return defaults;
 
 
     if (!s) return defaults;
 

-    wxStringTokenizer tkn(s, wxT("| "), wxTOKEN_STRTOK);
+    wxStringTokenizer tkn(s, wxT("| \t\n"), wxTOKEN_STRTOK);

     int style = 0;
     int index;
     wxString fl;
     int style = 0;
     int index;
     wxString fl;


@@ -633,7 +763,8 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults)
 
 wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
 {
 
 wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
 {

-    wxString str1(GetParamValue(param));
+    wxXmlNode *parNode = GetParamNode(param);
+    wxString str1(GetNodeContent(parNode));

     wxString str2;
     const wxChar *dt;
     wxChar amp_char;
     wxString str2;
     const wxChar *dt;
     wxChar amp_char;


@@ -669,11 +800,31 @@ wxString wxXmlResourceHandler::GetText(const wxString& param, bool translate)
         else str2 << *dt;
     }
 
         else str2 << *dt;
     }
 

-    if (translate && m_resource->GetFlags() & wxXRC_USE_LOCALE)
-        return wxGetTranslation(str2);
+    if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
+    {
+        if (translate && parNode &&
+            parNode->GetPropVal(wxT("translate"), wxEmptyString) != wxT("0"))
+        {
+            return wxGetTranslation(str2);
+        }
+        else
+        {
+#if wxUSE_UNICODE
+            return str2;
+#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);
+#endif
+        }
+    }

     else
     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;
         return str2;

-
+    }

 }
 
 
 }
 
 


@@ -690,32 +841,14 @@ long wxXmlResourceHandler::GetLong(const wxString& param, long defaultv)
 }
 
 
 }
 
 

+

 int wxXmlResourceHandler::GetID()
 {
 int wxXmlResourceHandler::GetID()
 {

-    wxString sid = GetName();
-    long num;
-
-    if (sid == wxT("-1")) return -1;
-    else if (sid.IsNumber() && sid.ToLong(&num)) return num;
-#define stdID(id) else if (sid == wxT(#id)) return id
-    stdID(wxID_OPEN); stdID(wxID_CLOSE); stdID(wxID_NEW);
-    stdID(wxID_SAVE); stdID(wxID_SAVEAS); stdID(wxID_REVERT);
-    stdID(wxID_EXIT); stdID(wxID_UNDO); stdID(wxID_REDO);
-    stdID(wxID_HELP); stdID(wxID_PRINT); stdID(wxID_PRINT_SETUP);
-    stdID(wxID_PREVIEW); stdID(wxID_ABOUT); stdID(wxID_HELP_CONTENTS);
-    stdID(wxID_HELP_COMMANDS); stdID(wxID_HELP_PROCEDURES);
-    stdID(wxID_CUT); stdID(wxID_COPY); stdID(wxID_PASTE);
-    stdID(wxID_CLEAR); stdID(wxID_FIND); stdID(wxID_DUPLICATE);
-    stdID(wxID_SELECTALL); stdID(wxID_OK); stdID(wxID_CANCEL);
-    stdID(wxID_APPLY); stdID(wxID_YES); stdID(wxID_NO);
-    stdID(wxID_STATIC); stdID(wxID_FORWARD); stdID(wxID_BACKWARD);
-    stdID(wxID_DEFAULT); stdID(wxID_MORE); stdID(wxID_SETUP);
-    stdID(wxID_RESET); stdID(wxID_HELP_CONTEXT);
-#undef stdID
-    else return wxXmlResource::GetXRCID(sid);
+    return wxXmlResource::GetXRCID(GetName());

 }
 
 
 }
 
 

+

 wxString wxXmlResourceHandler::GetName()
 {
     return m_node->GetPropVal(wxT("name"), wxT("-1"));
 wxString wxXmlResourceHandler::GetName()
 {
     return m_node->GetPropVal(wxT("name"), wxT("-1"));


@@ -753,15 +886,40 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param)
 
 
 
 
 
 

-wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
+wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param,
+                                         const wxArtClient& defaultArtClient,
+                                         wxSize size)

 {
 {

+    /* If the bitmap is specified as stock item, query wxArtProvider for it: */
+    wxXmlNode *bmpNode = GetParamNode(param);
+    if ( bmpNode )
+    {
+        wxString sid = bmpNode->GetPropVal(wxT("stock_id"), wxEmptyString);
+        if ( !sid.empty() )
+        {
+            wxString scl = bmpNode->GetPropVal(wxT("stock_client"), wxEmptyString);
+            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);
+            if ( stockArt.Ok() )
+                return stockArt;
+        }
+    }
+
+    /* ...or load the bitmap from file: */

     wxString name = GetParamValue(param);
     if (name.IsEmpty()) return wxNullBitmap;
 #if wxUSE_FILESYSTEM
     wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
     if (fsfile == NULL)
     {
     wxString name = GetParamValue(param);
     if (name.IsEmpty()) return wxNullBitmap;
 #if wxUSE_FILESYSTEM
     wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
     if (fsfile == NULL)
     {

-        wxLogError(_("XRC resource: Cannot create bitmap from '%s'."), param.c_str());
+        wxLogError(_("XRC resource: Cannot create bitmap from '%s'."),
+                   name.c_str());

         return wxNullBitmap;
     }
     wxImage img(*(fsfile->GetStream()));
         return wxNullBitmap;
     }
     wxImage img(*(fsfile->GetStream()));


@@ -769,6 +927,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
 #else
     wxImage img(GetParamValue(wxT("bitmap")));
 #endif
 #else
     wxImage img(GetParamValue(wxT("bitmap")));
 #endif

+

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


@@ -776,21 +935,17 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
     }
     if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
     return wxBitmap(img);
     }
     if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
     return wxBitmap(img);

+

 }
 
 
 
 }
 
 
 

-wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, wxSize size)
+wxIcon wxXmlResourceHandler::GetIcon(const wxString& param,
+                                     const wxArtClient& defaultArtClient,
+                                     wxSize size)

 {
 {

-#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)

     wxIcon icon;
     wxIcon icon;

-    icon.CopyFromBitmap(GetBitmap(param, size));
-#else
-    wxIcon *iconpt;
-    wxBitmap bmppt = GetBitmap(param, size);
-    iconpt = (wxIcon*)(&bmppt);
-    wxIcon icon(*iconpt);
-#endif
+    icon.CopyFromBitmap(GetBitmap(param, defaultArtClient, size));

     return icon;
 }
 
     return icon;
 }
 


@@ -798,6 +953,8 @@ wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, wxSize size)
 
 wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param)
 {
 
 wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param)
 {

+    wxCHECK_MSG(m_node, NULL, wxT("You can't access handler data before it was initialized!"));
+

     wxXmlNode *n = m_node->GetChildren();
 
     while (n)
     wxXmlNode *n = m_node->GetChildren();
 
     while (n)


@@ -843,7 +1000,7 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param)
     wxString s = GetParamValue(param);
     if (s.IsEmpty()) s = wxT("-1,-1");
     bool is_dlg;
     wxString s = GetParamValue(param);
     if (s.IsEmpty()) s = wxT("-1,-1");
     bool is_dlg;

-    long sx, sy;
+    long sx, sy = 0;

 
     is_dlg = s[s.Length()-1] == wxT('d');
     if (is_dlg) s.RemoveLast();
 
     is_dlg = s[s.Length()-1] == wxT('d');
     if (is_dlg) s.RemoveLast();


@@ -943,7 +1100,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     else if (family == wxT("swiss")) ifamily = wxSWISS;
     else if (family == wxT("modern")) ifamily = wxMODERN;
 
     else if (family == wxT("swiss")) ifamily = wxSWISS;
     else if (family == wxT("modern")) ifamily = wxMODERN;
 

-    bool underlined = GetBool(wxT("underlined"), FALSE);
+    bool underlined = GetBool(wxT("underlined"), false);

 
     wxString encoding = GetParamValue(wxT("encoding"));
     wxFontMapper mapper;
 
     wxString encoding = GetParamValue(wxT("encoding"));
     wxFontMapper mapper;


@@ -960,7 +1117,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     wxStringTokenizer tk(faces, wxT(","));
     while (tk.HasMoreTokens())
     {
     wxStringTokenizer tk(faces, wxT(","));
     while (tk.HasMoreTokens())
     {

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

         if (index != wxNOT_FOUND)
         {
             facename = (*enu.GetFacenames())[index];
         if (index != wxNOT_FOUND)
         {
             facename = (*enu.GetFacenames())[index];


@@ -980,17 +1137,20 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
     //FIXME : add cursor
 
     if (HasParam(wxT("exstyle")))
     //FIXME : add cursor
 
     if (HasParam(wxT("exstyle")))

-        wnd->SetExtraStyle(GetStyle(wxT("exstyle")));
+        // Have to OR it with existing style, since
+        // some implementations (e.g. wxGTK) use the extra style
+        // during creation
+        wnd->SetExtraStyle(wnd->GetExtraStyle() | GetStyle(wxT("exstyle")));

     if (HasParam(wxT("bg")))
         wnd->SetBackgroundColour(GetColour(wxT("bg")));
     if (HasParam(wxT("fg")))
         wnd->SetForegroundColour(GetColour(wxT("fg")));
     if (GetBool(wxT("enabled"), 1) == 0)
     if (HasParam(wxT("bg")))
         wnd->SetBackgroundColour(GetColour(wxT("bg")));
     if (HasParam(wxT("fg")))
         wnd->SetForegroundColour(GetColour(wxT("fg")));
     if (GetBool(wxT("enabled"), 1) == 0)

-        wnd->Enable(FALSE);
+        wnd->Enable(false);

     if (GetBool(wxT("focused"), 0) == 1)
         wnd->SetFocus();
     if (GetBool(wxT("hidden"), 0) == 1)
     if (GetBool(wxT("focused"), 0) == 1)
         wnd->SetFocus();
     if (GetBool(wxT("hidden"), 0) == 1)

-        wnd->Show(FALSE);
+        wnd->Show(false);

 #if wxUSE_TOOLTIPS
     if (HasParam(wxT("tooltip")))
         wnd->SetToolTip(GetText(wxT("tooltip")));
 #if wxUSE_TOOLTIPS
     if (HasParam(wxT("tooltip")))
         wnd->SetToolTip(GetText(wxT("tooltip")));


@@ -1007,12 +1167,10 @@ void wxXmlResourceHandler::CreateChildren(wxObject *parent, bool this_hnd_only)
     while (n)
     {
         if (n->GetType() == wxXML_ELEMENT_NODE &&
     while (n)
     {
         if (n->GetType() == wxXML_ELEMENT_NODE &&

-            n->GetName() == wxT("object"))
+           (n->GetName() == wxT("object") || n->GetName() == wxT("object_ref")))

         {
         {

-            if (this_hnd_only && CanHandle(n))
-                CreateResource(n, parent, NULL);
-            else
-                m_resource->CreateResFromNode(n, parent, NULL);
+            m_resource->CreateResFromNode(n, parent, NULL,
+                                          this_hnd_only ? this : NULL);

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


@@ -1055,7 +1213,7 @@ struct XRCID_record
 
 static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
 
 
 static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
 

-/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
+static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = -2)

 {
     static int XRCID_LastID = wxID_HIGHEST;
 
 {
     static int XRCID_LastID = wxID_HIGHEST;
 


@@ -1065,27 +1223,46 @@ static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
     index %= XRCID_TABLE_SIZE;
 
     XRCID_record *oldrec = NULL;
     index %= XRCID_TABLE_SIZE;
 
     XRCID_record *oldrec = NULL;

-    int matchcnt = 0;

     for (XRCID_record *rec = XRCID_Records[index]; rec; rec = rec->next)
     {
         if (wxStrcmp(rec->key, str_id) == 0)
         {
             return rec->id;
         }
     for (XRCID_record *rec = XRCID_Records[index]; rec; rec = rec->next)
     {
         if (wxStrcmp(rec->key, str_id) == 0)
         {
             return rec->id;
         }

-        matchcnt++;

         oldrec = rec;
     }
 
     XRCID_record **rec_var = (oldrec == NULL) ?
                               &XRCID_Records[index] : &oldrec->next;
     *rec_var = new XRCID_record;
         oldrec = rec;
     }
 
     XRCID_record **rec_var = (oldrec == NULL) ?
                               &XRCID_Records[index] : &oldrec->next;
     *rec_var = new XRCID_record;

-    (*rec_var)->id = ++XRCID_LastID;

     (*rec_var)->key = wxStrdup(str_id);
     (*rec_var)->next = NULL;
 
     (*rec_var)->key = wxStrdup(str_id);
     (*rec_var)->next = NULL;
 

+    wxChar *end;
+    if (value_if_not_found != -2)
+        (*rec_var)->id = value_if_not_found;
+    else
+    {
+        int asint = wxStrtol(str_id, &end, 10);
+        if (*str_id && *end == 0)
+        {
+            // if str_id was integer, keep it verbosely:
+            (*rec_var)->id = asint;
+        }
+        else
+        {
+            (*rec_var)->id = ++XRCID_LastID;
+        }
+    }
+

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

+/*static*/ int wxXmlResource::GetXRCID(const wxChar *str_id)
+{
+    return XRCID_Lookup(str_id);
+}
+

 
 static void CleanXRCID_Record(XRCID_record *rec)
 {
 
 static void CleanXRCID_Record(XRCID_record *rec)
 {


@@ -1100,11 +1277,119 @@ static void CleanXRCID_Record(XRCID_record *rec)
 static void CleanXRCID_Records()
 {
     for (int i = 0; i < XRCID_TABLE_SIZE; i++)
 static void CleanXRCID_Records()
 {
     for (int i = 0; i < XRCID_TABLE_SIZE; i++)

+    {

         CleanXRCID_Record(XRCID_Records[i]);
         CleanXRCID_Record(XRCID_Records[i]);

+        XRCID_Records[i] = NULL;
+    }

 }
 
 }
 

+static void AddStdXRCID_Records()
+{
+#define stdID(id) XRCID_Lookup(wxT(#id), id)
+    stdID(-1);
+
+    stdID(wxID_ANY);
+    stdID(wxID_SEPARATOR);
+    
+    stdID(wxID_OPEN);
+    stdID(wxID_CLOSE);
+    stdID(wxID_NEW);
+    stdID(wxID_SAVE);
+    stdID(wxID_SAVEAS);
+    stdID(wxID_REVERT);
+    stdID(wxID_EXIT);
+    stdID(wxID_UNDO);
+    stdID(wxID_REDO);
+    stdID(wxID_HELP);
+    stdID(wxID_PRINT);
+    stdID(wxID_PRINT_SETUP);
+    stdID(wxID_PREVIEW);
+    stdID(wxID_ABOUT);
+    stdID(wxID_HELP_CONTENTS);
+    stdID(wxID_HELP_COMMANDS);
+    stdID(wxID_HELP_PROCEDURES);
+    stdID(wxID_HELP_CONTEXT);
+    stdID(wxID_CLOSE_ALL);
+    stdID(wxID_PREFERENCES);
+    stdID(wxID_CUT);
+    stdID(wxID_COPY);
+    stdID(wxID_PASTE);
+    stdID(wxID_CLEAR);
+    stdID(wxID_FIND);
+    stdID(wxID_DUPLICATE);
+    stdID(wxID_SELECTALL);
+    stdID(wxID_DELETE);
+    stdID(wxID_REPLACE);
+    stdID(wxID_REPLACE_ALL);
+    stdID(wxID_PROPERTIES);
+    stdID(wxID_VIEW_DETAILS);
+    stdID(wxID_VIEW_LARGEICONS);
+    stdID(wxID_VIEW_SMALLICONS);
+    stdID(wxID_VIEW_LIST);
+    stdID(wxID_VIEW_SORTDATE);
+    stdID(wxID_VIEW_SORTNAME);
+    stdID(wxID_VIEW_SORTSIZE);
+    stdID(wxID_VIEW_SORTTYPE);
+    stdID(wxID_FILE1);
+    stdID(wxID_FILE2);
+    stdID(wxID_FILE3);
+    stdID(wxID_FILE4);
+    stdID(wxID_FILE5);
+    stdID(wxID_FILE6);
+    stdID(wxID_FILE7);
+    stdID(wxID_FILE8);
+    stdID(wxID_FILE9);
+    stdID(wxID_OK);
+    stdID(wxID_CANCEL);
+    stdID(wxID_APPLY);
+    stdID(wxID_YES);
+    stdID(wxID_NO);
+    stdID(wxID_STATIC);
+    stdID(wxID_FORWARD);
+    stdID(wxID_BACKWARD);
+    stdID(wxID_DEFAULT);
+    stdID(wxID_MORE);
+    stdID(wxID_SETUP);
+    stdID(wxID_RESET);
+    stdID(wxID_CONTEXT_HELP);
+    stdID(wxID_YESTOALL);
+    stdID(wxID_NOTOALL);
+    stdID(wxID_ABORT);
+    stdID(wxID_RETRY);
+    stdID(wxID_IGNORE);
+    stdID(wxID_ADD);
+    stdID(wxID_REMOVE);
+    stdID(wxID_UP);
+    stdID(wxID_DOWN);
+    stdID(wxID_HOME);
+    stdID(wxID_REFRESH);
+    stdID(wxID_STOP);
+    stdID(wxID_INDEX);
+    stdID(wxID_BOLD);
+    stdID(wxID_ITALIC);
+    stdID(wxID_JUSTIFY_CENTER);
+    stdID(wxID_JUSTIFY_FILL);
+    stdID(wxID_JUSTIFY_RIGHT);
+    stdID(wxID_JUSTIFY_LEFT);
+    stdID(wxID_UNDERLINE);
+    stdID(wxID_INDENT);
+    stdID(wxID_UNINDENT);
+    stdID(wxID_ZOOM_100);
+    stdID(wxID_ZOOM_FIT);
+    stdID(wxID_ZOOM_IN);
+    stdID(wxID_ZOOM_OUT);
+    stdID(wxID_UNDELETE);
+    stdID(wxID_REVERT_TO_SAVED);
+    stdID(wxID_SYSTEM_MENU);
+    stdID(wxID_CLOSE_FRAME);
+    stdID(wxID_MOVE_FRAME);
+    stdID(wxID_RESIZE_FRAME);
+    stdID(wxID_MAXIMIZE_FRAME);
+    stdID(wxID_ICONIZE_FRAME);
+    stdID(wxID_RESTORE_FRAME);

 
 

-
+#undef stdID
+}

 
 
 
 
 
 


@@ -1119,11 +1404,16 @@ public:
     wxXmlResourceModule() {}
     bool OnInit()
     {
     wxXmlResourceModule() {}
     bool OnInit()
     {

-        return TRUE;
+        AddStdXRCID_Records();
+        wxXmlResource::AddSubclassFactory(new wxXmlSubclassFactoryCXX);
+        return true;

     }
     void OnExit()
     {
         delete wxXmlResource::Set(NULL);
     }
     void OnExit()
     {
         delete wxXmlResource::Set(NULL);

+        if(wxXmlResource::ms_subclassFactories)
+            WX_CLEAR_LIST(wxXmlSubclassFactoriesList, *wxXmlResource::ms_subclassFactories);
+        wxDELETE(wxXmlResource::ms_subclassFactories);

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


@@ -1140,4 +1430,4 @@ void wxXmlInitResourceModule()
     wxModule::RegisterModule(module);
 }
 
     wxModule::RegisterModule(module);
 }
 

-
+#endif // wxUSE_XRC