From c6f41dc81e858f59f036978a3256c48bc24abdb6 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 19 Dec 2012 19:27:29 +0000 Subject: [PATCH] Add accessors for some of the data members in wxXmlResourceHandler git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/xrc/xmlreshandler.h | 9 ++++++ interface/wx/xrc/xmlres.h | 52 +++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/include/wx/xrc/xmlreshandler.h b/include/wx/xrc/xmlreshandler.h index 7c7f3fece3..d581299cb0 100644 --- a/include/wx/xrc/xmlreshandler.h +++ b/include/wx/xrc/xmlreshandler.h @@ -354,6 +354,15 @@ protected: wxWindow *m_parentAsWindow; wxXmlResource *m_resource; + // provide method access to those member variables + wxXmlResource* GetResource() const { return m_resource; } + wxXmlNode* GetNode() const { return m_node; } + wxString GetClass() const { return m_class; } + wxObject* GetParent() const { return m_parent; } + wxObject* GetInstance() const { return m_instance; } + wxWindow* GetParentAsWindow() const { return m_parentAsWindow; } + + wxArrayString m_styleNames; wxArrayInt m_styleValues; diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h index 4098705329..8e60fcf7c5 100644 --- a/interface/wx/xrc/xmlres.h +++ b/interface/wx/xrc/xmlres.h @@ -537,7 +537,7 @@ protected: /** Creates an animation (see wxAnimation) from the filename specified in @a param. */ - wxAnimation GetAnimation(const wxString& param = "animation"); + wxAnimation* GetAnimation(const wxString& param = "animation"); /** Gets a bitmap. @@ -742,5 +742,55 @@ protected: @since 2.9.0 */ void ReportParamError(const wxString& param, const wxString& message); + + + /** + After CreateResource has been called this will return the current + wxXmlResource object. + + @since 2.9.5 + */ + wxXmlResource* GetResource() const; + + /** + After CreateResource has been called this will return the XML node + being processed. + + @since 2.9.5 + */ + wxXmlNode* GetNode() const; + + /** + After CreateResource has been called this will return the class name of + the XML resource node being processed. + + @since 2.9.5 + */ + wxString GetClass() const; + + /** + After CreateResource has been called this will return the current + item's parent, if any. + + @since 2.9.5 + */ + wxObject* GetParent() const; + + /** + After CreateResource has been called this will return the instance that + the XML resource content should be created upon, if it has already been + created. If @NULL then the handler should create the object itself. + + @since 2.9.5 + */ + wxObject* GetInstance() const; + + /** + After CreateResource has been called this will return the item's parent + as a wxWindow. + + @since 2.9.5 + */ + wxWindow* GetParentAsWindow() const; }; -- 2.47.2