X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29b5f2cc190cbea87e4d0e43c35cab5d03315ca0..219a5f10c0e5efc3aad7ff3d050a92e7fed88806:/contrib/src/xml/xmlres.cpp

diff --git a/contrib/src/xml/xmlres.cpp b/contrib/src/xml/xmlres.cpp
index 0318204747..16b68d55d3 100644
--- a/contrib/src/xml/xmlres.cpp
+++ b/contrib/src/xml/xmlres.cpp
@@ -21,12 +21,17 @@
 
 #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/intl.h"
 #include "wx/tokenzr.h"
+#include "wx/fontenum.h"
 #include "wx/module.h"
+#include "wx/bitmap.h"
+#include "wx/image.h"
+#include "wx/fontmap.h"
 
 #include "wx/xml/xml.h"
 #include "wx/xml/xmlres.h"
@@ -35,15 +40,17 @@
 WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords);
 
 
-wxXmlResource::wxXmlResource()
+wxXmlResource::wxXmlResource(bool use_locale)
 {
-    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)
 {
-    m_Handlers.DeleteContents(TRUE);
-    Load(filemask, type);
+    m_useLocale = use_locale;
+    m_handlers.DeleteContents(TRUE);
+    Load(filemask);
 }
 
 wxXmlResource::~wxXmlResource()
@@ -52,10 +59,11 @@ wxXmlResource::~wxXmlResource()
 }
 
 
-bool wxXmlResource::Load(const wxString& filemask, int type)
+bool wxXmlResource::Load(const wxString& filemask)
 {
     wxString fnd;
     wxXmlResourceDataRecord *drec;
+    bool iswild = wxIsWild(filemask);
     
 #if wxUSE_FILESYSTEM
     wxFileSystem fsys;
@@ -64,13 +72,16 @@ bool wxXmlResource::Load(const wxString& filemask, int type)
 #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
-    fnd = wxXmlFindFirst;
+    if (iswild)
+        fnd = wxXmlFindFirst;
+    else
+        fnd = filemask;
     while (!!fnd)
     {
 #if wxUSE_FILESYSTEM
-        if (type == wxXML_ARCHIVE)
+        if (filemask.Lower().Matches("*.zip") ||
+            filemask.Lower().Matches("*.rsc"))
         {
             wxFileSystem fs2;
             wxString fnd2;
@@ -80,7 +91,7 @@ bool wxXmlResource::Load(const wxString& filemask, int type)
             {
                 drec = new wxXmlResourceDataRecord;
                 drec->File = fnd2;
-                m_Data.Add(drec);
+                m_data.Add(drec);
                 fnd2 = fs2.FindNext();
             }
         }
@@ -89,9 +100,13 @@ bool wxXmlResource::Load(const wxString& filemask, int type)
         {
             drec = new wxXmlResourceDataRecord;
             drec->File = fnd;
-            m_Data.Add(drec);
+            m_data.Add(drec);
         }
-        fnd = wxXmlFindNext;
+
+        if (iswild)
+            fnd = wxXmlFindNext;
+        else
+            fnd = wxEmptyString;
     }
 #   undef wxXmlFindFirst
 #   undef wxXmlFindNext
@@ -102,7 +117,7 @@ bool wxXmlResource::Load(const wxString& filemask, int type)
 
 void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
 {
-    m_Handlers.Append(handler);
+    m_handlers.Append(handler);
     handler->SetParentResource(this);
 }
 
@@ -110,21 +125,28 @@ void wxXmlResource::AddHandler(wxXmlResourceHandler *handler)
 
 void wxXmlResource::ClearHandlers()
 {
-    m_Handlers.Clear();
+    m_handlers.Clear();
 }
 
 
 
 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)
 {
-    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 +161,44 @@ wxDialog *wxXmlResource::LoadDialog(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 *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)
 {
-    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(
+                               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;
 }
 
 
@@ -168,7 +212,7 @@ void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
     while (c)
     {
         isok = FALSE;
-        if (!c->GetPropVal(_T("platform"), &s)) 
+        if (!c->GetPropVal(wxT("platform"), &s)) 
             isok = TRUE;
         else
         {
@@ -179,13 +223,13 @@ void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
                 s = tkn.GetNextToken();    
                 if (
 #ifdef __WXMSW__
-                    s == wxString(_T("win"))
+                    s == wxString(wxT("win"))
 #elif defined(__UNIX__)
-                    s == wxString(_T("unix"))
+                    s == wxString(wxT("unix"))
 #elif defined(__MAC__)
-                    s == wxString(_T("mac"))
+                    s == wxString(wxT("mac"))
 #elif defined(__OS2__)
-                    s == wxString(_T("os2"))
+                    s == wxString(wxT("os2"))
 #else
                     FALSE
 #endif
@@ -211,55 +255,64 @@ void wxXmlResource::UpdateResources()
 {
     bool modif;
 #   if wxUSE_FILESYSTEM
-    wxFSFile *file;
+    wxFSFile *file = NULL;
     wxFileSystem fsys;
 #   endif
 
-    for (size_t i = 0; i < m_Data.GetCount(); i++)
+    for (size_t i = 0; i < m_data.GetCount(); i++)
     {
-        modif = (m_Data[i].Doc == NULL);
+        modif = (m_data[i].Doc == NULL);
 
         if (!modif)
         {
 #           if wxUSE_FILESYSTEM
-            file = fsys.OpenFile(m_Data[i].File);
-            modif = file && file->GetModificationTime() > m_Data[i].Time;
+            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());
-            delete file;
+                wxLogError(_("Cannot open file '%s'."), m_data[i].File.c_str());
+            wxDELETE(file);
 #           else
-            modif = wxDateTime(wxFileModificationTime(m_Data[i].File)) > m_Data[i].Time;
+            modif = wxDateTime(wxFileModificationTime(m_data[i].File)) > m_data[i].Time;
 #           endif
         }
         
         if (modif)
         {
-            wxInputStream *stream;
+			wxInputStream *stream = NULL;
 
 #           if wxUSE_FILESYSTEM
-            file = fsys.OpenFile(m_Data[i].File);
-            stream = file->GetStream();
+            file = fsys.OpenFile(m_data[i].File);
+			if (file)
+				stream = file->GetStream();
 #           else
-            stream = new wxFileInputStream(m_Data[i].File);
+            stream = new wxFileInputStream(m_data[i].File);
 #           endif
             
             if (stream) 
             {
-                delete m_Data[i].Doc;
-                m_Data[i].Doc = new wxXmlDocument;
+                delete m_data[i].Doc;
+                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());
-
-            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());
-
-            ProcessPlatformProperty(m_Data[i].Doc->GetRoot());
+            if (!stream || !m_data[i].Doc->Load(*stream))
+            {
+                wxLogError(_("Cannot load resources from file '%s'."), m_data[i].File.c_str());
+                wxDELETE(m_data[i].Doc);
+            }
+            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());
+                wxDELETE(m_data[i].Doc);
+            }
+            else
+			{
+                ProcessPlatformProperty(m_data[i].Doc->GetRoot());
+				m_data[i].Time = file->GetModificationTime();
+			}
 
 #           if wxUSE_FILESYSTEM
-            delete file;
+				wxDELETE(file);
 #           else
-            delete stream;
+				wxDELETE(stream);
 #           endif
         }
     }
@@ -267,24 +320,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++)
+    for (size_t f = 0; f < m_data.GetCount(); f++)
     {
-        for (wxXmlNode *node = m_Data[f].Doc->GetRoot()->GetChildren(); 
+        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);
+#endif
                 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;
 }
 
@@ -296,11 +357,11 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx
     
     wxXmlResourceHandler *handler;
     wxObject *ret;
-    wxNode * ND = m_Handlers.GetFirst();
+    wxNode * ND = m_handlers.GetFirst();
     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;
@@ -308,7 +369,9 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx
         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;
 }
 
@@ -321,29 +384,32 @@ wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wx
 
 
 wxXmlResourceHandler::wxXmlResourceHandler()
-        : m_Node(NULL), m_Parent(NULL), m_Instance(NULL), 
-          m_ParentAsWindow(NULL), m_InstanceAsWindow(NULL)
+        : m_node(NULL), m_parent(NULL), m_instance(NULL), 
+          m_parentAsWindow(NULL), m_instanceAsWindow(NULL)
 {}
 
 
 
 wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent, wxObject *instance)
 {
-    wxXmlNode *myNode = m_Node;
-    wxObject *myParent = m_Parent, *myInstance = m_Instance;
-    wxWindow *myParentAW = m_ParentAsWindow, *myInstanceAW = m_InstanceAsWindow;
+    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;
-    m_Parent = parent;
-    m_Instance = instance;
-    m_ParentAsWindow = wxDynamicCast(m_Parent, wxWindow);
-    m_InstanceAsWindow = wxDynamicCast(m_Instance, wxWindow);
+    m_node = node;
+    m_class = node->GetPropVal(wxT("class"), wxEmptyString);
+    m_parent = parent;
+    m_instance = instance;
+    m_parentAsWindow = wxDynamicCast(m_parent, wxWindow);
+    m_instanceAsWindow = wxDynamicCast(m_instance, wxWindow);
     
     wxObject *returned = DoCreateResource();
     
-    m_Node = myNode;
-    m_Parent = myParent; m_ParentAsWindow = myParentAW;
-    m_Instance = myInstance; m_InstanceAsWindow = myInstanceAW;
+    m_node = myNode;
+    m_class = myClass;
+    m_parent = myParent; m_parentAsWindow = myParentAW;
+    m_instance = myInstance; m_instanceAsWindow = myInstanceAW;
     
     return returned;
 }
@@ -351,11 +417,26 @@ wxObject *wxXmlResourceHandler::CreateResource(wxXmlNode *node, wxObject *parent
 
 void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
 {
-    m_StyleNames.Add(name);
-    m_StyleValues.Add(value);
+    m_styleNames.Add(name);
+    m_styleValues.Add(value);
+}
+
+
+
+void wxXmlResourceHandler::AddWindowStyles()
+{
+    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);
@@ -368,16 +449,16 @@ int wxXmlResourceHandler::GetStyle(const wxString& param, int defaults)
     
     if (!s) return defaults;
     
-    wxStringTokenizer tkn(s, _T("| "), wxTOKEN_STRTOK);
+    wxStringTokenizer tkn(s, wxT("| "), wxTOKEN_STRTOK);
     int style = 0;
     int index;
     wxString fl;
     while (tkn.HasMoreTokens())
     {
         fl = tkn.GetNextToken();
-        index = m_StyleNames.Index(fl);
+        index = m_styleNames.Index(fl);
         if (index != wxNOT_FOUND)
-            style |= m_StyleValues[index];
+            style |= m_styleValues[index];
         else
             wxLogError(_("Unknown style flag ") + fl);
     }
@@ -413,7 +494,11 @@ wxString wxXmlResourceHandler::GetText(const wxString& param)
             }
         else str2 << *dt;
     }
-    return str2;
+    
+    if (m_resource->GetUseLocale())
+        return wxGetTranslation(str2);
+    else
+        return str2;
 }
 
 
@@ -435,9 +520,9 @@ int wxXmlResourceHandler::GetID()
     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;
-#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);
@@ -458,7 +543,7 @@ int wxXmlResourceHandler::GetID()
 
 wxString wxXmlResourceHandler::GetName()
 {
-    return m_Node->GetPropVal(_T("name"), _T("-1"));
+    return m_node->GetPropVal(wxT("name"), wxT("-1"));
 }
 
 
@@ -468,7 +553,7 @@ bool wxXmlResourceHandler::GetBool(const wxString& param, bool defaultv)
     wxString v = GetParamValue(param);
     v.MakeLower();
     if (!v) return defaultv;
-    else return (v == _T("1"));
+    else return (v == wxT("1"));
 }
 
 
@@ -478,8 +563,8 @@ wxColour wxXmlResourceHandler::GetColour(const wxString& param)
     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());
@@ -492,9 +577,53 @@ 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(wxT("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 *n = m_node->GetChildren();
     
     while (n)
     {
@@ -526,7 +655,10 @@ wxString wxXmlResourceHandler::GetNodeContent(wxXmlNode *node)
 
 wxString wxXmlResourceHandler::GetParamValue(const wxString& param)
 {
-    return GetNodeContent(GetParamNode(param));
+    if (param.IsEmpty())
+        return GetNodeContent(m_node);
+    else
+        return GetNodeContent(GetParamNode(param));
 }
 
 
@@ -534,15 +666,15 @@ wxString wxXmlResourceHandler::GetParamValue(const wxString& 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;
     
-    is_dlg = s[s.Length()-1] == _T('d');
+    is_dlg = s[s.Length()-1] == wxT('d');
     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;
@@ -550,10 +682,10 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param)
     
     if (is_dlg)
     {
-        if (m_InstanceAsWindow)
-            return wxDLG_UNIT(m_InstanceAsWindow, wxSize(sx, sy));
-        else if (m_ParentAsWindow)
-            return wxDLG_UNIT(m_ParentAsWindow, wxSize(sx, sy));
+        if (m_instanceAsWindow)
+            return wxDLG_UNIT(m_instanceAsWindow, wxSize(sx, sy));
+        else if (m_parentAsWindow)
+            return wxDLG_UNIT(m_parentAsWindow, wxSize(sx, sy));
         else
         {
             wxLogError(_("Cannot convert dialog units: dialog unknown."));
@@ -573,54 +705,158 @@ 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] == wxT('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(wxT("size"), 12);
+
+    wxString style = GetParamValue(wxT("style"));
+    wxString weight = GetParamValue(wxT("weight"));
+    int istyle = wxNORMAL, iweight = wxNORMAL;  
+    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();
+    wxStringTokenizer tk(faces, wxT(","));
+    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)
 {
-    //FIXME : add font, 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);
-    if (GetBool(_T("focused"), 0) == 1)
+    if (GetBool(wxT("focused"), 0) == 1)
         wnd->SetFocus();
-    if (GetBool(_T("hidden"), 0) == 1)
+    if (GetBool(wxT("hidden"), 0) == 1)
         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      
+    if (HasParam(wxT("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)
     {
-        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);
+                m_resource->CreateResFromNode(n, parent, NULL);
         }
         n = n->GetNext();
     }
 }
 
 
+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();
+    }
+}
 
 
 
@@ -628,9 +864,10 @@ void wxXmlResourceHandler::CreateChildren(wxObject *parent,
 
 
 
-// --------------- XMLID implementation -----------------------------
 
 
+// --------------- XMLID implementation -----------------------------
+
 #define XMLID_TABLE_SIZE     1024
 
 
@@ -642,10 +879,11 @@ struct XMLID_record
 };
 
 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 XMLID_LastID = wxID_HIGHEST;
+    
     int index = 0;
     
     for (const char *c = str_id; *c != '\0'; c++) index += (int)*c;
@@ -657,9 +895,6 @@ static int XMLID_LastID = wxID_HIGHEST;
     {
         if (strcmp(rec->key, str_id) == 0)
         {
-#ifdef DEBUG_XMLID_HASH
-            printf("XMLID: matched '%s' (%ith item)\n", rec->key, matchcnt);
-#endif
             return rec->id;
         }
         matchcnt++;
@@ -672,10 +907,6 @@ static int XMLID_LastID = wxID_HIGHEST;
     (*rec_var)->id = ++XMLID_LastID;
     (*rec_var)->key = strdup(str_id);
     (*rec_var)->next = NULL;
-#ifdef DEBUG_XMLID_HASH
-    printf("XMLID: new key for '%s': %i at %i (%ith item)\n", 
-           (*rec_var)->key, (*rec_var)->id, index, matchcnt);
-#endif
     
     return (*rec_var)->id;
 }
@@ -685,9 +916,6 @@ static void CleanXMLID_Record(XMLID_record *rec)
 {
     if (rec)
     {
-#ifdef DEBUG_XMLID_HASH
-        printf("XMLID: clearing '%s'\n", rec->key);
-#endif
         CleanXMLID_Record(rec->next);
         free (rec->key);
         delete rec;