WX_DEFINE_OBJARRAY(wxXmlResourceDataRecords);
-wxXmlResource::wxXmlResource(bool use_locale)
+wxXmlResource *wxXmlResource::ms_instance = NULL;
+
+/*static*/ wxXmlResource *wxXmlResource::Get()
+{
+ if ( !ms_instance )
+ ms_instance = new wxXmlResource;
+ return ms_instance;
+}
+
+/*static*/ wxXmlResource *wxXmlResource::Set(wxXmlResource *res)
+{
+ wxXmlResource *old = ms_instance;
+ ms_instance = res;
+ return old;
+}
+
+wxXmlResource::wxXmlResource(int flags)
{
m_handlers.DeleteContents(TRUE);
- m_useLocale = use_locale;
+ m_flags = flags;
m_version = -1;
}
-wxXmlResource::wxXmlResource(const wxString& filemask, bool use_locale)
+wxXmlResource::wxXmlResource(const wxString& filemask, int flags)
{
- m_useLocale = use_locale;
+ m_flags = flags;
m_version = -1;
m_handlers.DeleteContents(TRUE);
Load(filemask);
-wxMenuBar *wxXmlResource::LoadMenuBar(const wxString& name)
+wxMenuBar *wxXmlResource::LoadMenuBar(wxWindow *parent, const wxString& name)
{
- return (wxMenuBar*)CreateResFromNode(FindResource(name, wxT("wxMenuBar")), NULL, NULL);
+ return (wxMenuBar*)CreateResFromNode(FindResource(name, wxT("wxMenuBar")), parent, NULL);
}
+#if wxUSE_TOOLBAR
wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name)
{
return (wxToolBar*)CreateResFromNode(FindResource(name, wxT("wxToolBar")), parent, NULL);
}
-
+#endif
wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name)
}
+wxXmlNode *wxXmlResource::DoFindResource(wxXmlNode *parent,
+ const wxString& name,
+ const wxString& classname,
+ bool recursive)
+{
+ wxString dummy;
+ wxXmlNode *node;
+
+ // first search for match at the top-level nodes (as this is
+ // where the resource is most commonly looked for):
+ for (node = parent->GetChildren(); node; node = node->GetNext())
+ {
+ 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;
+ }
+
+ if ( recursive )
+ for (node = parent->GetChildren(); node; node = node->GetNext())
+ {
+ if ( node->GetType() == wxXML_ELEMENT_NODE &&
+ (node->GetName() == wxT("object") ||
+ node->GetName() == wxT("object_ref")) )
+ {
+ wxXmlNode* found = DoFindResource(node, name, classname, TRUE);
+ if ( found )
+ return found;
+ }
+ }
+
+ return NULL;
+}
-wxXmlNode *wxXmlResource::FindResource(const wxString& name, const wxString& classname)
+wxXmlNode *wxXmlResource::FindResource(const wxString& name,
+ const wxString& classname,
+ bool recursive)
{
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())
- 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 ( m_data[f].Doc == NULL || m_data[f].Doc->GetRoot() == NULL )
+ continue;
+
+ wxXmlNode* found = DoFindResource(m_data[f].Doc->GetRoot(),
+ name, classname, recursive);
+ if ( found )
+ {
#if wxUSE_FILESYSTEM
- m_curFileSystem.ChangePathTo(m_data[f].File);
+ m_curFileSystem.ChangePathTo(m_data[f].File);
#endif
- return node;
- }
+ return found;
+ }
}
wxLogError(_("XRC resource '%s' (class '%s') not found!"),
return NULL;
}
+static void MergeNodes(wxXmlNode& dest, wxXmlNode& with)
+{
+ // Merge properties:
+ for (wxXmlProperty *prop = with.GetProperties(); prop; prop = prop->GetNext())
+ {
+ wxXmlProperty *dprop;
+ for (dprop = dest.GetProperties(); dprop; dprop = dprop->GetNext())
+ {
+
+ if ( dprop->GetName() == prop->GetName() )
+ {
+ dprop->SetValue(prop->GetValue());
+ break;
+ }
+ }
+
+ if ( !dprop )
+ dest.AddProperty(prop->GetName(), prop->GetValue());
+ }
+ // Merge child nodes:
+ for (wxXmlNode* node = with.GetChildren(); node; node = node->GetNext())
+ {
+ wxString name = node->GetPropVal(wxT("name"), wxEmptyString);
+ wxXmlNode *dnode;
+
+ for (dnode = dest.GetChildren(); dnode; dnode = dnode->GetNext() )
+ {
+ if ( dnode->GetName() == node->GetName() &&
+ dnode->GetPropVal("name", wxEmptyString) == name &&
+ dnode->GetType() == node->GetType() )
+ {
+ MergeNodes(*dnode, *node);
+ break;
+ }
+ }
+
+ if ( !dnode )
+ dest.AddChild(new wxXmlNode(*node));
+ }
+
+ if ( dest.GetType() == wxXML_TEXT_NODE && with.GetContent().Length() )
+ dest.SetContent(with.GetContent());
+}
wxObject *wxXmlResource::CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance)
{
if (node == NULL) return NULL;
+ // handling of referenced resource
+ if ( node->GetName() == wxT("object_ref") )
+ {
+ wxString refName = node->GetPropVal(wxT("ref"), wxEmptyString);
+ wxXmlNode* refNode = FindResource(refName, wxEmptyString, TRUE);
+
+ if ( !refNode )
+ {
+ wxLogError(_("Referenced object node with ref=\"%s\" not found!"),
+ refName.c_str());
+ return NULL;
+ }
+
+ wxXmlNode copy(*refNode);
+ MergeNodes(copy, *node);
+
+ return CreateResFromNode(©, parent, instance);
+ }
+
wxXmlResourceHandler *handler;
wxObject *ret;
wxNode * ND = m_handlers.GetFirst();
-
-
-
-
-
wxXmlResourceHandler::wxXmlResourceHandler()
: m_node(NULL), m_parent(NULL), m_instance(NULL),
m_parentAsWindow(NULL), m_instanceAsWindow(NULL)
wxObject *myParent = m_parent, *myInstance = m_instance;
wxWindow *myParentAW = m_parentAsWindow, *myInstanceAW = m_instanceAsWindow;
+ m_instance = instance;
+ if (!m_instance && node->HasProp(wxT("subclass")) &&
+ !(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)
+ {
+ wxLogError(_("Subclass '%s' not found for resource '%s', not subclassing!"),
+ subclass.c_str(), node->GetPropVal(wxT("name"), wxEmptyString).c_str());
+ }
+
+ m_instance = classInfo->CreateObject();
+ }
+
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);
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(wxNO_BORDER);
- ADD_STYLE(wxTRANSPARENT_WINDOW);
- ADD_STYLE(wxWANTS_CHARS);
- ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
+ XRC_ADD_STYLE(wxSIMPLE_BORDER);
+ XRC_ADD_STYLE(wxSUNKEN_BORDER);
+ XRC_ADD_STYLE(wxDOUBLE_BORDER);
+ XRC_ADD_STYLE(wxRAISED_BORDER);
+ XRC_ADD_STYLE(wxSTATIC_BORDER);
+ XRC_ADD_STYLE(wxNO_BORDER);
+ XRC_ADD_STYLE(wxTRANSPARENT_WINDOW);
+ XRC_ADD_STYLE(wxWANTS_CHARS);
+ XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
}
const wxChar *dt;
wxChar amp_char;
- if (m_resource->GetUseLocale())
+ if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
str1 = wxGetTranslation(GetParamValue(param));
else
str1 = GetParamValue(param);
// --------------- module and globals -----------------------------
-
-static wxXmlResource gs_XmlResource;
-
-wxXmlResource *wxTheXmlResource = &gs_XmlResource;
-
-
class wxXmlResourceModule: public wxModule
{
DECLARE_DYNAMIC_CLASS(wxXmlResourceModule)
public:
wxXmlResourceModule() {}
- bool OnInit() {return TRUE;}
+ bool OnInit()
+ {
+ return TRUE;
+ }
void OnExit()
{
- wxTheXmlResource->ClearHandlers();
+ delete wxXmlResource::Set(NULL);
CleanXMLID_Records();
}
};
projects / wxWidgets.git / blobdiff