#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"
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("toolbar")), parent, NULL);
+ return (wxToolBar*)CreateResFromNode(FindResource(name, wxT("wxToolBar")), parent, NULL);
}
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;
}
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; }
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; }
-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
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);
}
}
- 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;
}
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;
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;
}
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;
+ m_Class = node->GetPropVal(_T("class"), wxEmptyString);
m_Parent = parent;
m_Instance = instance;
m_ParentAsWindow = wxDynamicCast(m_Parent, wxWindow);
wxObject *returned = DoCreateResource();
m_Node = myNode;
+ m_Class = myClass;
m_Parent = myParent; m_ParentAsWindow = myParentAW;
m_Instance = myInstance; m_InstanceAsWindow = myInstanceAW;
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;
- long size = GetLong(_("size"), 12);
+ long size = GetLong(_T("size"), 12);
- wxString style = GetParamValue(_("style"));
- wxString weight = GetParamValue(_("weight"));
+ wxString style = GetParamValue(_T("style"));
+ wxString weight = GetParamValue(_T("weight"));
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 == _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, ",");
+ wxStringTokenizer tk(faces, _T(","));
while (tk.HasMoreTokens())
{
int index = enu.GetFacenames()->Index(tk.GetNextToken(), FALSE);
m_Node = oldnode;
- wxFont font(size, wxDEFAULT, istyle, iweight, underlined,
- facename, wxFONTENCODING_DEFAULT);
+ wxFont font(size, ifamily, istyle, iweight, underlined, facename, enc);
return font;
}
}
-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() == _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);
}
}
+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();
+ }
+}
+
+
projects / wxWidgets.git / blobdiff