1) some cleanup in wxHtmlWindow, moved private structures out of headers

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

diff --git a/contrib/src/xml/xmlres.cpp b/contrib/src/xml/xmlres.cpp
index c2d6d67dd9cf2c37d2ac4a4bd89418d6e04c125d..19c6eaf4cf46d0d2064784ac00b825df5dfe5e94 100644 (file)
--- a/contrib/src/xml/xmlres.cpp
+++ b/contrib/src/xml/xmlres.cpp
@@ -21,6 +21,7 @@
 
 #include "wx/dialog.h"
 #include "wx/panel.h"
 
 #include "wx/dialog.h"
 #include "wx/panel.h"

+#include "wx/frame.h"

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


@@ -30,6 +31,7 @@
 #include "wx/module.h"
 #include "wx/bitmap.h"
 #include "wx/image.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"


@@ -38,13 +40,13 @@
 WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords);
 
 
 WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords);
 
 

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

 {
     m_Handlers.DeleteContents(TRUE);
     m_UseLocale = use_locale;
 }
     
 {
     m_Handlers.DeleteContents(TRUE);
     m_UseLocale = use_locale;
 }
     

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

 {
     m_UseLocale = use_locale;
     m_Handlers.DeleteContents(TRUE);
 {
     m_UseLocale = use_locale;
     m_Handlers.DeleteContents(TRUE);


@@ -130,21 +132,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)
 {
 }
 
 
 
 wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name)
 {

-    return (wxToolBar*)CreateResFromNode(FindResource(name, wxT("toolbar")), parent, NULL);
+    return (wxToolBar*)CreateResFromNode(FindResource(name, wxT("wxToolBar")), parent, NULL);

 }
 
 
 }
 
 


@@ -159,30 +161,30 @@ 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;

 }
 
 }
 

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

 
 wxBitmap wxXmlResource::LoadBitmap(const wxString& name)
 {
     wxBitmap *bmp = (wxBitmap*)CreateResFromNode(
 
 wxBitmap wxXmlResource::LoadBitmap(const wxString& name)
 {
     wxBitmap *bmp = (wxBitmap*)CreateResFromNode(

-                               FindResource(name, wxT("bitmap")), NULL, NULL);
+                               FindResource(name, wxT("wxBitmap")), NULL, NULL);

     wxBitmap rt;
 
     if (bmp) { rt = *bmp; delete bmp; }
     wxBitmap rt;
 
     if (bmp) { rt = *bmp; delete bmp; }


@@ -192,7 +194,7 @@ wxBitmap wxXmlResource::LoadBitmap(const wxString& name)
 wxIcon wxXmlResource::LoadIcon(const wxString& name)
 {
     wxIcon *icon = (wxIcon*)CreateResFromNode(
 wxIcon wxXmlResource::LoadIcon(const wxString& name)
 {
     wxIcon *icon = (wxIcon*)CreateResFromNode(

-                            FindResource(name, wxT("icon")), NULL, NULL);
+                            FindResource(name, wxT("wxIcon")), NULL, NULL);

     wxIcon rt;
 
     if (icon) { rt = *icon; delete icon; }
     wxIcon rt;
 
     if (icon) { rt = *icon; delete icon; }


@@ -210,7 +212,7 @@ void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
     while (c)
     {
         isok = FALSE;
     while (c)
     {
         isok = FALSE;

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

             isok = TRUE;
         else
         {
             isok = TRUE;
         else
         {


@@ -221,13 +223,13 @@ void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
                 s = tkn.GetNextToken();    
                 if (
 #ifdef __WXMSW__
                 s = tkn.GetNextToken();    
                 if (
 #ifdef __WXMSW__

-                    s == wxString(_T("win"))
+                    s == wxString(wxT("win"))

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

-                    s == wxString(_T("unix"))
+                    s == wxString(wxT("unix"))

 #elif defined(__MAC__)
 #elif defined(__MAC__)

-                    s == wxString(_T("mac"))
+                    s == wxString(wxT("mac"))

 #elif defined(__OS2__)
 #elif defined(__OS2__)

-                    s == wxString(_T("os2"))
+                    s == wxString(wxT("os2"))

 #else
                     FALSE
 #endif
 #else
                     FALSE
 #endif


@@ -253,7 +255,7 @@ void wxXmlResource::UpdateResources()
 {
     bool modif;
 #   if wxUSE_FILESYSTEM
 {
     bool modif;
 #   if wxUSE_FILESYSTEM

-    wxFSFile *file;
+    wxFSFile *file = NULL;

     wxFileSystem fsys;
 #   endif
 
     wxFileSystem fsys;
 #   endif
 


@@ -268,7 +270,7 @@ void wxXmlResource::UpdateResources()
             modif = file && file->GetModificationTime() > m_Data[i].Time;
             if (!file)
                 wxLogError(_("Cannot open file '%s'."), m_Data[i].File.c_str());
             modif = file && file->GetModificationTime() > m_Data[i].Time;
             if (!file)
                 wxLogError(_("Cannot open file '%s'."), m_Data[i].File.c_str());

-            delete file;
+            wxDELETE(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


@@ -276,11 +278,12 @@ void wxXmlResource::UpdateResources()
         
         if (modif)
         {
         
         if (modif)
         {

-            wxInputStream *stream;
+                       wxInputStream *stream = NULL;

 
 #           if wxUSE_FILESYSTEM
             file = fsys.OpenFile(m_Data[i].File);
 
 #           if wxUSE_FILESYSTEM
             file = fsys.OpenFile(m_Data[i].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


@@ -293,22 +296,23 @@ void wxXmlResource::UpdateResources()
             if (!stream || !m_Data[i].Doc->Load(*stream))
             {
                 wxLogError(_("Cannot load resources from file '%s'."), m_Data[i].File.c_str());
             if (!stream || !m_Data[i].Doc->Load(*stream))
             {
                 wxLogError(_("Cannot load resources from file '%s'."), m_Data[i].File.c_str());

-                delete m_Data[i].Doc;
-                m_Data[i].Doc = NULL;
+                wxDELETE(m_Data[i].Doc);

             }
             }

-            else if (m_Data[i].Doc->GetRoot()->GetName() != _T("resource")) 
+            else if (m_Data[i].Doc->GetRoot()->GetName() != wxT("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;
+                wxDELETE(m_Data[i].Doc);

             }
             else
             }
             else

+                       {

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

+                               m_Data[i].Time = file->GetModificationTime();
+                       }

 
 #           if wxUSE_FILESYSTEM
 
 #           if wxUSE_FILESYSTEM

-            delete file;
+                               wxDELETE(file);

 #           else
 #           else

-            delete stream;
+                               wxDELETE(stream);

 #           endif
         }
     }
 #           endif
         }
     }


@@ -316,7 +320,7 @@ 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
     
 {
     UpdateResources(); //ensure everything is up-to-date
     


@@ -326,10 +330,12 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& typ
         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())
         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())

-            if (    node->GetType() == wxXML_ELEMENT_NODE &&
-                    (!type || node->GetName() == type) &&
-                    node->GetPropVal(wxT("name"), &dummy) &&
-                    dummy == name)
+            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);
             {
 #if wxUSE_FILESYSTEM
                 m_CurFileSystem.ChangePathTo(m_Data[f].File);


@@ -338,8 +344,8 @@ wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& typ
             }
     }
 
             }
     }
 

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


@@ -355,7 +361,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() == wxT("object") && handler->CanHandle(node))

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


@@ -363,7 +369,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(wxT("class"), wxEmptyString).c_str());

     return NULL;
 }
 
     return NULL;
 }
 


@@ -385,10 +393,12 @@ wxXmlResourceHandler::wxXmlResourceHandler()
 wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance)
 {
     wxXmlNode *myNode = m_Node;
 wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance)
 {
     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(wxT("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);


@@ -397,6 +407,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;
     


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

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

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


@@ -509,9 +520,9 @@ int wxXmlResourceHandler::GetID()
     wxString sid = GetName();
     long num;
     
     wxString sid = GetName();
     long num;
     

-    if (sid == _T("-1")) return -1;
+    if (sid == wxT("-1")) return -1;

     else if (sid.IsNumber() && sid.ToLong(&num)) return num;
     else if (sid.IsNumber() && sid.ToLong(&num)) return num;

-#define stdID(id) else if (sid == _T(#id)) return id
+#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_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);


@@ -532,7 +543,7 @@ int wxXmlResourceHandler::GetID()
 
 wxString wxXmlResourceHandler::GetName()
 {
 
 wxString wxXmlResourceHandler::GetName()
 {

-    return m_Node->GetPropVal(_T("name"), _T("-1"));
+    return m_Node->GetPropVal(wxT("name"), wxT("-1"));

 }
 
 
 }
 
 


@@ -542,7 +553,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"));
+    else return (v == wxT("1"));

 }
 
 
 }
 
 


@@ -552,8 +563,8 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param)
     wxString v = GetParamValue(param);
     unsigned long tmp = 0; 
     
     wxString v = GetParamValue(param);
     unsigned long tmp = 0; 
     

-    if (v.Length() != 7 || v[0] != _T('#') ||
-        wxSscanf(v.c_str(), _T("#%lX"), &tmp) != 1)
+    if (v.Length() != 7 || v[0u] != wxT('#') ||
+        wxSscanf(v.c_str(), wxT("#%lX"), &tmp) != 1)

     {
         wxLogError(_("XML resource: Incorrect colour specification '%s' for property '%s'."),
                    v.c_str(), param.c_str());
     {
         wxLogError(_("XML resource: Incorrect colour specification '%s' for property '%s'."),
                    v.c_str(), param.c_str());


@@ -581,7 +592,7 @@ wxBitmap wxXmlResourceHandler::GetBitmap(const wxString& param, wxSize size)
     wxImage img(*(fsfile->GetStream()));
     delete fsfile;
 #else
     wxImage img(*(fsfile->GetStream()));
     delete fsfile;
 #else

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

 #endif
     if (!img.Ok()) 
     {
 #endif
     if (!img.Ok()) 
     {


@@ -655,15 +666,15 @@ 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.IsEmpty()) s = _T("-1,-1");
+    if (s.IsEmpty()) s = wxT("-1,-1");

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

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

     if (is_dlg) s.RemoveLast();
     
     if (is_dlg) s.RemoveLast();
     

-    if (!s.BeforeFirst(_T(',')).ToLong(&sx) ||
-        !s.AfterLast(_T(',')).ToLong(&sy))
+    if (!s.BeforeFirst(wxT(',')).ToLong(&sx) ||
+        !s.AfterLast(wxT(',')).ToLong(&sy))

     {
         wxLogError(_("Cannot parse coordinates from '%s'."), s.mb_str());
         return wxDefaultSize;
     {
         wxLogError(_("Cannot parse coordinates from '%s'."), s.mb_str());
         return wxDefaultSize;


@@ -701,7 +712,7 @@ wxCoord wxXmlResourceHandler::GetDimension(const wxString& param, wxCoord defaul
     bool is_dlg;
     long sx;
     
     bool is_dlg;
     long sx;
     

-    is_dlg = s[s.Length()-1] == _T('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))


@@ -732,33 +743,44 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     wxXmlNode *font_node = GetParamNode(param);
     if (font_node == NULL)
     {
     wxXmlNode *font_node = GetParamNode(param);
     if (font_node == NULL)
     {

-        wxLogError("Cannot find font node '%s'.", param.mb_str());
+        wxLogError(_("Cannot find font node '%s'."), param.mb_str());

         return wxNullFont;
     }
     
     wxXmlNode *oldnode = m_Node;
     m_Node = font_node;
 
         return wxNullFont;
     }
     
     wxXmlNode *oldnode = m_Node;
     m_Node = font_node;
 

-    long size = GetLong(_("size"), 12);
+    long size = GetLong(wxT("size"), 12);

 
 

-    wxString style = GetParamValue(_("style"));
-    wxString weight = GetParamValue(_("weight"));
+    wxString style = GetParamValue(wxT("style"));
+    wxString weight = GetParamValue(wxT("weight"));

     int istyle = wxNORMAL, iweight = wxNORMAL;  
     int istyle = wxNORMAL, iweight = wxNORMAL;  

-    if (style == _("italic")) istyle = wxITALIC;
-    else if (style == _("slant")) istyle = wxSLANT;
-    if (weight == _("bold")) iweight = wxBOLD;
-    else if (weight == _("light")) iweight = wxLIGHT;
-
-    bool underlined = GetBool(_("underlined"), FALSE);
-
-    wxString encoding = GetParamValue(_("encoding"));
-    // FIXME - handle encoding
-
-    wxString faces = GetParamValue(_("face"));
+    if (style == wxT("italic")) istyle = wxITALIC;
+    else if (style == wxT("slant")) istyle = wxSLANT;
+    if (weight == wxT("bold")) iweight = wxBOLD;
+    else if (weight == wxT("light")) iweight = wxLIGHT;
+
+    wxString family = GetParamValue(wxT("family"));
+    int ifamily = wxDEFAULT;
+         if (family == wxT("decorative")) ifamily = wxDECORATIVE;
+    else if (family == wxT("roman")) ifamily = wxROMAN;
+    else if (family == wxT("script")) ifamily = wxSCRIPT;
+    else if (family == wxT("swiss")) ifamily = wxSWISS;
+    else if (family == wxT("modern")) ifamily = wxMODERN;
+
+    bool underlined = GetBool(wxT("underlined"), FALSE);
+
+    wxString encoding = GetParamValue(wxT("encoding"));
+    wxFontMapper mapper;
+    wxFontEncoding enc = wxFONTENCODING_DEFAULT;
+    if (!encoding.IsEmpty()) enc = mapper.CharsetToEncoding(encoding);
+    if (enc == wxFONTENCODING_SYSTEM) enc = wxFONTENCODING_SYSTEM;
+
+    wxString faces = GetParamValue(wxT("face"));

     wxString facename = wxEmptyString;
     wxFontEnumerator enu;
     enu.EnumerateFacenames();
     wxString facename = wxEmptyString;
     wxFontEnumerator enu;
     enu.EnumerateFacenames();

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

     while (tk.HasMoreTokens()) 
     {
         int index = enu.GetFacenames()->Index(tk.GetNextToken(), FALSE);
     while (tk.HasMoreTokens()) 
     {
         int index = enu.GetFacenames()->Index(tk.GetNextToken(), FALSE);


@@ -771,8 +793,7 @@ wxFont wxXmlResourceHandler::GetFont(const wxString& param)
     
     m_Node = oldnode;
     
     
     m_Node = oldnode;
     

-    wxFont font(size, wxDEFAULT, istyle, iweight, underlined, 
-                facename, wxFONTENCODING_DEFAULT);
+    wxFont font(size, ifamily, istyle, iweight, underlined, facename, enc);

     return font;
 }
 
     return font;
 }
 


@@ -781,44 +802,38 @@ void wxXmlResourceHandler::SetupWindow(wxWindow *wnd)
 {
     //FIXME : add cursor
     
 {
     //FIXME : add cursor
     

-    if (HasParam(_T("exstyle")))
-        wnd->SetExtraStyle(GetStyle(_T("exstyle")));
-    if (HasParam(_T("bg")))
-        wnd->SetBackgroundColour(GetColour(_T("bg")));
-    if (HasParam(_T("fg")))
-        wnd->SetForegroundColour(GetColour(_T("fg")));
-    if (GetBool(_T("enabled"), 1) == 0)
+    if (HasParam(wxT("exstyle")))
+        wnd->SetExtraStyle(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)

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

-    if (GetBool(_T("focused"), 0) == 1)
+    if (GetBool(wxT("focused"), 0) == 1)

         wnd->SetFocus();
         wnd->SetFocus();

-    if (GetBool(_T("hidden"), 0) == 1)
+    if (GetBool(wxT("hidden"), 0) == 1)

         wnd->Show(FALSE);
 #if wxUSE_TOOLTIPS
         wnd->Show(FALSE);
 #if wxUSE_TOOLTIPS

-    if (HasParam(_T("tooltip")))
-        wnd->SetToolTip(GetText(_T("tooltip")));
+    if (HasParam(wxT("tooltip")))
+        wnd->SetToolTip(GetText(wxT("tooltip")));

 #endif      
 #endif      

-    if (HasParam(_T("font")))
+    if (HasParam(wxT("font")))

         wnd->SetFont(GetFont());
 }
 
 
         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() == wxT("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);
         }


@@ -827,6 +842,23 @@ void wxXmlResourceHandler::CreateChildren(wxObject *parent,
 }
 
 
 }
 
 

+void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode)
+{
+    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();
+    }
+}
+
+

 
 
 
 
 
 


@@ -847,10 +879,11 @@ struct XMLID_record
 };
 
 static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {NULL};
 };
 
 static XMLID_record *XMLID_Records[XMLID_TABLE_SIZE] = {NULL};

-static int XMLID_LastID = wxID_HIGHEST;

 
 /*static*/ int wxXmlResource::GetXMLID(const char *str_id)
 {
 
 /*static*/ int wxXmlResource::GetXMLID(const char *str_id)
 {

+    static int XMLID_LastID = wxID_HIGHEST;
+    

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