fixed MDI accel bug, more tests for it in the sample

[wxWidgets.git] / contrib / src / xml / xmlres.cpp

diff --git a/contrib/src/xml/xmlres.cpp b/contrib/src/xml/xmlres.cpp
index ea00c03c756b0d7b68246fbc3a023a6b87a28516..7fb10475f0b664878c939b61a8f09df7e37e31ec 100644 (file)
--- a/contrib/src/xml/xmlres.cpp
+++ b/contrib/src/xml/xmlres.cpp
@@ -26,7 +26,11 @@
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/tokenzr.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/tokenzr.h"

+#include "wx/fontenum.h"

 #include "wx/module.h"
 #include "wx/module.h"

+#include "wx/bitmap.h"
+#include "wx/image.h"
+#include "wx/fontmap.h"

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


@@ -35,15 +39,17 @@
 WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords);
 
 
 WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords);
 
 

-wxXmlResource::wxXmlResource()
+wxXmlResource::wxXmlResource(bool use_locale = TRUE)

 {
     m_Handlers.DeleteContents(TRUE);
 {
     m_Handlers.DeleteContents(TRUE);

+    m_UseLocale = use_locale;

 }
     
 }
     

-wxXmlResource::wxXmlResource(const wxString& filemask, int type)
+wxXmlResource::wxXmlResource(const wxString& filemask, bool use_locale = TRUE)

 {
 {

+    m_UseLocale = use_locale;

     m_Handlers.DeleteContents(TRUE);
     m_Handlers.DeleteContents(TRUE);

-    Load(filemask, type);
+    Load(filemask);

 }
 
 wxXmlResource::~wxXmlResource()
 }
 
 wxXmlResource::~wxXmlResource()


@@ -52,10 +58,11 @@ wxXmlResource::~wxXmlResource()
 }
 
 
 }
 
 

-bool wxXmlResource::Load(const wxString& filemask, int type)
+bool wxXmlResource::Load(const wxString& filemask)

 {
     wxString fnd;
     wxXmlResourceDataRecord *drec;
 {
     wxString fnd;
     wxXmlResourceDataRecord *drec;

+    bool iswild = wxIsWild(filemask);

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


@@ -64,13 +71,16 @@ bool wxXmlResource::Load(const wxString& filemask, int type)
 #else
 #   define wxXmlFindFirst  wxFindFirstFile(filemask, wxFILE)
 #   define wxXmlFindNext   wxFindNextFile()
 #else
 #   define wxXmlFindFirst  wxFindFirstFile(filemask, wxFILE)
 #   define wxXmlFindNext   wxFindNextFile()

-    wxASSERT_MSG(type != wxXML_ARCHIVE, wxT("ZIP archive XML resources supported only with wxUSE_FILESYSTEM set to 1!"));

 #endif
 #endif

-    fnd = wxXmlFindFirst;
+    if (iswild)
+        fnd = wxXmlFindFirst;
+    else
+        fnd = filemask;

     while (!!fnd)
     {
 #if wxUSE_FILESYSTEM
     while (!!fnd)
     {
 #if wxUSE_FILESYSTEM

-        if (type == wxXML_ARCHIVE)
+        if (filemask.Lower().Matches("*.zip") ||
+            filemask.Lower().Matches("*.rsc"))

         {
             wxFileSystem fs2;
             wxString fnd2;
         {
             wxFileSystem fs2;
             wxString fnd2;


@@ -91,7 +101,11 @@ bool wxXmlResource::Load(const wxString& filemask, int type)
             drec->File = fnd;
             m_Data.Add(drec);
         }
             drec->File = fnd;
             m_Data.Add(drec);
         }

-        fnd = wxXmlFindNext;
+
+        if (iswild)
+            fnd = wxXmlFindNext;
+        else
+            fnd = wxEmptyString;

     }
 #   undef wxXmlFindFirst
 #   undef wxXmlFindNext
     }
 #   undef wxXmlFindFirst
 #   undef wxXmlFindNext


@@ -117,14 +131,21 @@ void wxXmlResource::ClearHandlers()
 
 wxMenu *wxXmlResource::LoadMenu(const wxString& name)
 {
 
 wxMenu *wxXmlResource::LoadMenu(const wxString& name)
 {

-    return (wxMenu*)CreateResFromNode(FindResource(name, wxT("menu")), NULL, NULL);
+    return (wxMenu*)CreateResFromNode(FindResource(name, wxT("wxMenu")), NULL, NULL);

 }
 
 
 
 wxMenuBar *wxXmlResource::LoadMenuBar(const wxString& name)
 {
 }
 
 
 
 wxMenuBar *wxXmlResource::LoadMenuBar(const wxString& name)
 {

-    return (wxMenuBar*)CreateResFromNode(FindResource(name, wxT("menubar")), NULL, NULL);
+    return (wxMenuBar*)CreateResFromNode(FindResource(name, wxT("wxMenuBar")), NULL, NULL);
+}
+
+
+
+wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name)
+{
+    return (wxToolBar*)CreateResFromNode(FindResource(name, wxT("wxToolBar")), parent, NULL);

 }
 
 
 }
 
 


@@ -139,22 +160,89 @@ wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name)
 
 bool wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name)
 {
 
 bool wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name)
 {

-    return CreateResFromNode(FindResource(name, wxT("dialog")), parent, dlg) != NULL;
+    return CreateResFromNode(FindResource(name, wxT("wxDialog")), parent, dlg) != NULL;

 }
 
 
 
 wxPanel *wxXmlResource::LoadPanel(wxWindow *parent, const wxString& name)
 {
 }
 
 
 
 wxPanel *wxXmlResource::LoadPanel(wxWindow *parent, const wxString& name)
 {

-    wxPanel *panel = new wxPanel;
-    if (!LoadPanel(panel, parent, name))
-        { delete panel; return NULL; }
-    else return panel;
+    return (wxPanel*)CreateResFromNode(FindResource(name, wxT("wxPanel")), parent, NULL);

 }
 
 bool wxXmlResource::LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name)
 {
 }
 
 bool wxXmlResource::LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name)
 {

-    return CreateResFromNode(FindResource(name, wxT("panel")), parent, panel) != NULL;
+    return CreateResFromNode(FindResource(name, wxT("wxPanel")), parent, panel) != NULL;
+}
+
+
+
+wxBitmap wxXmlResource::LoadBitmap(const wxString& name)
+{
+    wxBitmap *bmp = (wxBitmap*)CreateResFromNode(
+                               FindResource(name, wxT("wxBitmap")), NULL, NULL);
+    wxBitmap rt;
+
+    if (bmp) { rt = *bmp; delete bmp; }
+    return rt;
+}
+
+wxIcon wxXmlResource::LoadIcon(const wxString& name)
+{
+    wxIcon *icon = (wxIcon*)CreateResFromNode(
+                            FindResource(name, wxT("wxIcon")), NULL, NULL);
+    wxIcon rt;
+
+    if (icon) { rt = *icon; delete icon; }
+    return rt;
+}
+
+
+
+void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
+{
+    wxString s;
+    bool isok;
+    
+    wxXmlNode *c = node->GetChildren();
+    while (c)
+    {
+        isok = FALSE;
+        if (!c->GetPropVal(_T("platform"), &s)) 
+            isok = TRUE;
+        else
+        {
+            wxStringTokenizer tkn(s, " |");
+
+            while (tkn.HasMoreTokens())
+            {
+                s = tkn.GetNextToken();    
+                if (
+#ifdef __WXMSW__
+                    s == wxString(_T("win"))
+#elif defined(__UNIX__)
+                    s == wxString(_T("unix"))
+#elif defined(__MAC__)
+                    s == wxString(_T("mac"))
+#elif defined(__OS2__)
+                    s == wxString(_T("os2"))
+#else
+                    FALSE
+#endif
+              ) isok = TRUE;
+            }
+        }
+        
+        if (isok)
+            ProcessPlatformProperty(c);
+        else
+        {
+            node->RemoveChild(c);
+            delete c;
+        }
+        
+        c = c->GetNext();
+    }

 }
 
 
 }
 
 


@@ -201,10 +289,19 @@ void wxXmlResource::UpdateResources()
                 m_Data[i].Doc = new wxXmlDocument;
             }
             if (!stream || !m_Data[i].Doc->Load(*stream))
                 m_Data[i].Doc = new wxXmlDocument;
             }
             if (!stream || !m_Data[i].Doc->Load(*stream))

+            {

                 wxLogError(_("Cannot load resources from file '%s'."), m_Data[i].File.c_str());
                 wxLogError(_("Cannot load resources from file '%s'."), m_Data[i].File.c_str());

-
-            if (m_Data[i].Doc->GetRoot()->GetName() != _T("resource")) 
+                delete m_Data[i].Doc;
+                m_Data[i].Doc = NULL;
+            }
+            else if (m_Data[i].Doc->GetRoot()->GetName() != _T("resource")) 
+            {

                 wxLogError(_("Invalid XML resource '%s': doesn't have root node 'resource'."), m_Data[i].File.c_str());
                 wxLogError(_("Invalid XML resource '%s': doesn't have root node 'resource'."), m_Data[i].File.c_str());

+                delete m_Data[i].Doc;
+                m_Data[i].Doc = NULL;
+            }
+            else
+                ProcessPlatformProperty(m_Data[i].Doc->GetRoot());

 
 #           if wxUSE_FILESYSTEM
             delete file;
 
 #           if wxUSE_FILESYSTEM
             delete file;


@@ -217,25 +314,32 @@ void wxXmlResource::UpdateResources()
 
 
 
 
 
 

-wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& type)
+wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& classname)

 {
     UpdateResources(); //ensure everything is up-to-date
     
     wxString dummy;   
     for (size_t f = 0; f < m_Data.GetCount(); f++)
     {
 {
     UpdateResources(); //ensure everything is up-to-date
     
     wxString dummy;   
     for (size_t f = 0; f < m_Data.GetCount(); f++)
     {

+        if (m_Data[f].Doc == NULL || m_Data[f].Doc->GetRoot() == NULL) continue;

         for (wxXmlNode *node = m_Data[f].Doc->GetRoot()->GetChildren(); 
                                       node; node = node->GetNext())
         for (wxXmlNode *node = m_Data[f].Doc->GetRoot()->GetChildren(); 
                                       node; node = node->GetNext())

-            if (    node->GetType() == wxXML_ELEMENT_NODE &&
-                    (!type || node->GetName() == type) &&
-                    node->GetPropVal(wxT("name"), &dummy) &&
-                    dummy == name &&
-                    wxXmlResourceHandler::CheckPlatform(node))
+            if (node->GetType() == wxXML_ELEMENT_NODE &&
+                (!classname || 
+                  node->GetPropVal(wxT("class"), wxEmptyString) == classname) &&
+                node->GetName() == wxT("object") &&
+                node->GetPropVal(wxT("name"), &dummy) &&
+                dummy == name)
+            {
+#if wxUSE_FILESYSTEM
+                m_CurFileSystem.ChangePathTo(m_Data[f].File);
+#endif

                 return node;
                 return node;

+            }

     }
 
     }
 

-    wxLogError(_("XML resource '%s' (type '%s') not found!"), 
-               name.c_str(), type.c_str());
+    wxLogError(_("XML resource '%s' (class '%s') not found!"), 
+               name.c_str(), classname.c_str());

     return NULL;
 }
 
     return NULL;
 }
 


@@ -251,7 +355,7 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx
     while (ND)
     {
         handler = (wxXmlResourceHandler*)ND->GetData();
     while (ND)
     {
         handler = (wxXmlResourceHandler*)ND->GetData();

-        if (handler->CanHandle(node))
+        if (node->GetName() == _T("object") && handler->CanHandle(node))

         {
             ret = handler->CreateResource(node, parent, instance);
             if (ret) return ret;
         {
             ret = handler->CreateResource(node, parent, instance);
             if (ret) return ret;


@@ -259,7 +363,9 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx
         ND = ND->GetNext();
     }
 
         ND = ND->GetNext();
     }
 

-    wxLogError(_("No handler found for XML node '%s'!"), node->GetName().c_str());
+    wxLogError(_("No handler found for XML node '%s', class '%s'!"), 
+               node->GetName().c_str(), 
+               node->GetPropVal(_T("class"), wxEmptyString).c_str());

     return NULL;
 }
 
     return NULL;
 }
 


@@ -280,13 +386,13 @@ wxXmlResourceHandler::wxXmlResourceHandler()
 
 wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance)
 {
 
 wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance)
 {

-    if (!CheckPlatform(node)) return NULL;
-

     wxXmlNode *myNode = m_Node;
     wxXmlNode *myNode = m_Node;

+    wxString myClass = m_Class;

     wxObject *myParent = m_Parent, *myInstance = m_Instance;
     wxWindow *myParentAW = m_ParentAsWindow, *myInstanceAW = m_InstanceAsWindow;
     
     m_Node = node;
     wxObject *myParent = m_Parent, *myInstance = m_Instance;
     wxWindow *myParentAW = m_ParentAsWindow, *myInstanceAW = m_InstanceAsWindow;
     
     m_Node = node;

+    m_Class = node->GetPropVal(_T("class"), wxEmptyString);

     m_Parent = parent;
     m_Instance = instance;
     m_ParentAsWindow = wxDynamicCast(m_Parent, wxWindow);
     m_Parent = parent;
     m_Instance = instance;
     m_ParentAsWindow = wxDynamicCast(m_Parent, wxWindow);


@@ -295,6 +401,7 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
     wxObject *returned = DoCreateResource();
     
     m_Node = myNode;
     wxObject *returned = DoCreateResource();
     
     m_Node = myNode;

+    m_Class = myClass;

     m_Parent = myParent; m_ParentAsWindow = myParentAW;
     m_Instance = myInstance; m_InstanceAsWindow = myInstanceAW;
     
     m_Parent = myParent; m_ParentAsWindow = myParentAW;
     m_Instance = myInstance; m_InstanceAsWindow = myInstanceAW;
     


@@ -302,33 +409,28 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
 }
 
 
 }
 
 

-
-/*static*/ bool wxXmlResourceHandler::CheckPlatform(wxXmlNode *node)
+void wxXmlResourceHandler::AddStyle(const wxString& name, int value)

 {
 {

-    wxString s;
-    if (!node->GetPropVal(_T("platform"), &s)) return TRUE;
-#ifdef __WXMSW__
-    return s == wxString(_T("win"));
-#elif defined(__UNIX__)
-    return s == wxString(_T("unix"));
-#elif defined(__MAC__)
-    return s == wxString(_T("mac"));
-#elif defined(__OS2__)
-    return s == wxString(_T("os2"));
-#else
-    wxLogWarning(_("You're running the application on unknown platform, check for platfrom '%s' failed."), s.mb_str());
-    return TRUE; // unknown platform
-#endif
+    m_StyleNames.Add(name);
+    m_StyleValues.Add(value);

 }
 
 
 }
 
 

-void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
+
+void wxXmlResourceHandler::AddWindowStyles()

 {
 {

-    m_StyleNames.Add(name);
-    m_StyleValues.Add(value);
+    ADD_STYLE(wxSIMPLE_BORDER);
+    ADD_STYLE(wxSUNKEN_BORDER);
+    ADD_STYLE(wxDOUBLE_BORDER);
+    ADD_STYLE(wxRAISED_BORDER);
+    ADD_STYLE(wxSTATIC_BORDER);
+    ADD_STYLE(wxTRANSPARENT_WINDOW);
+    ADD_STYLE(wxWANTS_CHARS);
+    ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);

 }
 
 
 }
 
 

+

 bool wxXmlResourceHandler::HasParam(const wxString& param)
 {
     return (GetParamNode(param) != NULL);
 bool wxXmlResourceHandler::HasParam(const wxString& param)
 {
     return (GetParamNode(param) != NULL);


@@ -386,7 +488,11 @@ wxString wxXmlResourceHandler::GetText(const wxString& param)
             }
         else str2 << *dt;
     }
             }
         else str2 << *dt;
     }

-    return str2;
+    
+    if (m_Resource->GetUseLocale())
+        return wxGetTranslation(str2);
+    else
+        return str2;

 }
 
 
 }
 
 


@@ -441,8 +547,7 @@ 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 == _T("1") || v == _T("t") || v == _T("yes") ||
-                v == _T("on") || v == _T("true");
+    else return (v == _T("1"));

 }
 
 
 }
 
 


@@ -466,6 +571,50 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param)
 }
 
 
 }
 
 

+
+wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
+{
+    wxString name = GetParamValue(param);
+    if (name.IsEmpty()) return wxNullBitmap;
+#if wxUSE_FILESYSTEM
+    wxFSFile *fsfile = GetCurFileSystem().OpenFile(name);
+    if (fsfile == NULL)
+    {
+        wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.mb_str());
+        return wxNullBitmap;
+    }    
+    wxImage img(*(fsfile->GetStream()));
+    delete fsfile;
+#else
+    wxImage img(GetParamValue(_T("bitmap")));
+#endif
+    if (!img.Ok()) 
+    {
+        wxLogError(_("XML resource: Cannot create bitmap from '%s'."), param.mb_str());
+        return wxNullBitmap;
+    }
+    if (!(size == wxDefaultSize)) img.Rescale(size.x, size.y);
+    return img.ConvertToBitmap();
+}
+
+
+
+wxIcon wxXmlResourceHandler::GetIcon(const wxString& param, wxSize size)
+{
+#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
+    wxIcon icon;
+    icon.CopyFromBitmap(GetBitmap(param, size));
+#else
+    wxIcon *iconpt;
+    wxBitmap bmppt = GetBitmap(param, size);
+    iconpt = (wxIcon*)(&bmppt);
+    wxIcon icon(*iconpt);
+#endif
+    return icon;
+}
+
+
+

 wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param)
 {
     wxXmlNode *n = m_Node->GetChildren();
 wxXmlNode *wxXmlResourceHandler::GetParamNode(const wxString& param)
 {
     wxXmlNode *n = m_Node->GetChildren();


@@ -500,7 +649,10 @@ wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
 
 wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
 {
 
 wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
 {

-    return GetNodeContent(GetParamNode(param));
+    if (param.IsEmpty())
+        return GetNodeContent(m_Node);
+    else
+        return GetNodeContent(GetParamNode(param));

 }
 
 
 }
 
 


@@ -508,7 +660,7 @@ wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
 wxSize wxXmlResourceHandler::GetSize(const wxString& param)
 {
     wxString s = GetParamValue(param);
 wxSize wxXmlResourceHandler::GetSize(const wxString& param)
 {
     wxString s = GetParamValue(param);

-    if (!s) s = _T("-1,-1");
+    if (s.IsEmpty()) s = _T("-1,-1");

     bool is_dlg;
     long sx, sy;
     
     bool is_dlg;
     long sx, sy;
     


@@ -547,9 +699,102 @@ wxPoint wxXmlResourceHandler::GetPosition(const wxString& param)
 
 
 
 
 
 

+wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaultv)
+{
+    wxString s = GetParamValue(param);
+    if (s.IsEmpty()) return defaultv;
+    bool is_dlg;
+    long sx;
+    
+    is_dlg = s[s.Length()-1] == _T('d');
+    if (is_dlg) s.RemoveLast();
+    
+    if (!s.ToLong(&sx))
+    {
+        wxLogError(_("Cannot parse dimension from '%s'."), s.mb_str());
+        return defaultv;
+    }
+    
+    if (is_dlg)
+    {
+        if (m_InstanceAsWindow)
+            return wxDLG_UNIT(m_InstanceAsWindow, wxSize(sx, 0)).x;
+        else if (m_ParentAsWindow)
+            return wxDLG_UNIT(m_ParentAsWindow, wxSize(sx, 0)).x;
+        else
+        {
+            wxLogError(_("Cannot convert dialog units: dialog unknown."));
+            return defaultv;
+        }
+    }
+    else return sx;
+}
+
+
+
+wxFont wxXmlResourceHandler::GetFont(const wxString& param)
+{    
+    wxXmlNode *font_node = GetParamNode(param);
+    if (font_node == NULL)
+    {
+        wxLogError(_("Cannot find font node '%s'."), param.mb_str());
+        return wxNullFont;
+    }
+    
+    wxXmlNode *oldnode = m_Node;
+    m_Node = font_node;
+
+    long size = GetLong(_T("size"), 12);
+
+    wxString style = GetParamValue(_T("style"));
+    wxString weight = GetParamValue(_T("weight"));
+    int istyle = wxNORMAL, iweight = wxNORMAL;  
+    if (style == _T("italic")) istyle = wxITALIC;
+    else if (style == _T("slant")) istyle = wxSLANT;
+    if (weight == _T("bold")) iweight = wxBOLD;
+    else if (weight == _T("light")) iweight = wxLIGHT;
+
+    wxString family = GetParamValue(_T("family"));
+    int ifamily = wxDEFAULT;
+         if (family == _T("decorative")) ifamily = wxDECORATIVE;
+    else if (family == _T("roman")) ifamily = wxROMAN;
+    else if (family == _T("script")) ifamily = wxSCRIPT;
+    else if (family == _T("swiss")) ifamily = wxSWISS;
+    else if (family == _T("modern")) ifamily = wxMODERN;
+
+    bool underlined = GetBool(_T("underlined"), FALSE);
+
+    wxString encoding = GetParamValue(_T("encoding"));
+    wxFontMapper mapper;
+    wxFontEncoding enc = wxFONTENCODING_DEFAULT;
+    if (!encoding.IsEmpty()) enc = mapper.CharsetToEncoding(encoding);
+    if (enc == wxFONTENCODING_SYSTEM) enc = wxFONTENCODING_SYSTEM;
+
+    wxString faces = GetParamValue(_T("face"));
+    wxString facename = wxEmptyString;
+    wxFontEnumerator enu;
+    enu.EnumerateFacenames();
+    wxStringTokenizer tk(faces, _T(","));
+    while (tk.HasMoreTokens()) 
+    {
+        int index = enu.GetFacenames()->Index(tk.GetNextToken(), FALSE);
+        if (index != wxNOT_FOUND) 
+        {
+            facename = (*enu.GetFacenames())[index];
+            break;
+        }
+    }
+    
+    m_Node = oldnode;
+    
+    wxFont font(size, ifamily, istyle, iweight, underlined, facename, enc);
+    return font;
+}
+
+

 void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
 {
 void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
 {

-    //FIXME : add font, cursor
+    //FIXME : add cursor

     
     if (HasParam(_T("exstyle")))
         wnd->SetExtraStyle(GetStyle(_T("exstyle")));
     
     if (HasParam(_T("exstyle")))
         wnd->SetExtraStyle(GetStyle(_T("exstyle")));


@@ -567,26 +812,22 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
     if (HasParam(_T("tooltip")))
         wnd->SetToolTip(GetText(_T("tooltip")));
 #endif      
     if (HasParam(_T("tooltip")))
         wnd->SetToolTip(GetText(_T("tooltip")));
 #endif      

+    if (HasParam(_T("font")))
+        wnd->SetFont(GetFont());

 }
 
 
 }
 
 

-void wxXmlResourceHandler::CreateChildren(wxObject *parent, 
-                bool only_this_handler, wxXmlNode *children_node)
+void wxXmlResourceHandler::CreateChildren(wxObject *parent, bool this_hnd_only)

 {
 {

-    if (children_node == NULL) children_node = GetParamNode(_T("children"));
-    if (children_node == NULL) return;
-    
-    wxXmlNode *n = children_node->GetChildren();
-    
+    wxXmlNode *n = m_Node->GetChildren();
+

     while (n)
     {
     while (n)
     {

-        if (n->GetType() == wxXML_ELEMENT_NODE)
+        if (n->GetType() == wxXML_ELEMENT_NODE &&
+            n->GetName() == _T("object"))

         {        
         {        

-            if (only_this_handler)
-            {
-                if (CanHandle(n))
-                    CreateResource(n, parent, NULL);
-            }
+            if (this_hnd_only && CanHandle(n))
+                CreateResource(n, parent, NULL);

             else
                 m_Resource->CreateResFromNode(n, parent, NULL);
         }
             else
                 m_Resource->CreateResFromNode(n, parent, NULL);
         }


@@ -595,6 +836,23 @@ void wxXmlResourceHandler::CreateChildren(wxObject *parent,
 }
 
 
 }
 
 

+void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL)
+{
+    wxXmlNode *root;
+    if (rootnode == NULL) root = m_Node; else root = rootnode;
+    wxXmlNode *n = root->GetChildren();
+
+    while (n)
+    {
+        if (n->GetType() == wxXML_ELEMENT_NODE && CanHandle(n))
+        {
+            CreateResource(n, parent, NULL);
+        }
+        n = n->GetNext();
+    }
+}
+
+

 
 
 
 
 
 


@@ -604,13 +862,13 @@ void wxXmlResourceHandler::CreateChildren(wxObject *parent,
 
 // --------------- XMLID implementation -----------------------------
 
 
 // --------------- XMLID implementation -----------------------------
 

-

 #define XMLID_TABLE_SIZE     1024
 
 #define XMLID_TABLE_SIZE     1024
 

+

 struct XMLID_record
 {
     int id;
 struct XMLID_record
 {
     int id;

-    const char *key;
+    char *key;

     XMLID_record *next;
 };
 
     XMLID_record *next;
 };
 


@@ -625,9 +883,14 @@ static int XMLID_LastID = wxID_HIGHEST;
     index %= XMLID_TABLE_SIZE;
     
     XMLID_record *oldrec = NULL;
     index %= XMLID_TABLE_SIZE;
     
     XMLID_record *oldrec = NULL;

+    int matchcnt = 0;

     for (XMLID_record *rec = XMLID_Records[index]; rec; rec = rec->next)
     {
     for (XMLID_record *rec = XMLID_Records[index]; rec; rec = rec->next)
     {

-        if (strcmp(rec->key, str_id) == 0) return rec->id;
+        if (strcmp(rec->key, str_id) == 0)
+        {
+            return rec->id;
+        }
+        matchcnt++;

         oldrec = rec;
     }
     
         oldrec = rec;
     }
     


@@ -635,7 +898,7 @@ static int XMLID_LastID = wxID_HIGHEST;
                               &XMLID_Records[index] : &oldrec->next;
     *rec_var = new XMLID_record;
     (*rec_var)->id = ++XMLID_LastID;
                               &XMLID_Records[index] : &oldrec->next;
     *rec_var = new XMLID_record;
     (*rec_var)->id = ++XMLID_LastID;

-    (*rec_var)->key = str_id;
+    (*rec_var)->key = strdup(str_id);

     (*rec_var)->next = NULL;
     
     return (*rec_var)->id;
     (*rec_var)->next = NULL;
     
     return (*rec_var)->id;


@@ -647,6 +910,7 @@ static void CleanXMLID_Record(XMLID_record *rec)
     if (rec)
     {
         CleanXMLID_Record(rec->next);
     if (rec)
     {
         CleanXMLID_Record(rec->next);

+        free (rec->key);

         delete rec;
     }
 }
         delete rec;
     }
 }