fix object_ref handling in XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
317a0d7361
commit
e5db16098c
@ -239,8 +239,11 @@ protected:
|
||||
// Helper function: finds a resource (calls UpdateResources) and returns a node containing it.
|
||||
wxXmlNode *DoFindResource(wxXmlNode *parent, const wxString& name, const wxString& classname, bool recursive);
|
||||
|
||||
// Creates a resource from information in the given node.
|
||||
wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);
|
||||
// Creates a resource from information in the given node
|
||||
// (Uses only 'handlerToUse' if != NULL)
|
||||
wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent,
|
||||
wxObject *instance = NULL,
|
||||
wxXmlResourceHandler *handlerToUse = NULL);
|
||||
|
||||
private:
|
||||
long m_version;
|
||||
|
@ -239,8 +239,11 @@ protected:
|
||||
// Helper function: finds a resource (calls UpdateResources) and returns a node containing it.
|
||||
wxXmlNode *DoFindResource(wxXmlNode *parent, const wxString& name, const wxString& classname, bool recursive);
|
||||
|
||||
// Creates a resource from information in the given node.
|
||||
wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);
|
||||
// Creates a resource from information in the given node
|
||||
// (Uses only 'handlerToUse' if != NULL)
|
||||
wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent,
|
||||
wxObject *instance = NULL,
|
||||
wxXmlResourceHandler *handlerToUse = NULL);
|
||||
|
||||
private:
|
||||
long m_version;
|
||||
|
Loading…
Reference in New Issue
Block a user