From cc5fb63bf7768448762cb366555eaf458ccbd1a0 Mon Sep 17 00:00:00 2001 From: Ilya Sinitsyn Date: Tue, 9 Jun 2020 21:30:59 +0700 Subject: [PATCH] Add wxXmlResourceHandler::GetFilePath() The function already implemented in wxXmlResourceHandlerImpl. Just make it accessible from wxXmlResourceHandler. --- include/wx/xrc/xmlres.h | 2 +- include/wx/xrc/xmlreshandler.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h index c19d36dc31..984536230f 100644 --- a/include/wx/xrc/xmlres.h +++ b/include/wx/xrc/xmlres.h @@ -603,7 +603,7 @@ public: // Gets a file path from the given node, expanding environment variables in // it if wxXRC_USE_ENVVARS is in use. - wxString GetFilePath(const wxXmlNode* node); + wxString GetFilePath(const wxXmlNode* node) wxOVERRIDE; // Returns the window associated with the handler (may be NULL). wxWindow* GetParentAsWindow() const { return m_handler->GetParentAsWindow(); } diff --git a/include/wx/xrc/xmlreshandler.h b/include/wx/xrc/xmlreshandler.h index 8e4ffcb691..c4630915ac 100644 --- a/include/wx/xrc/xmlreshandler.h +++ b/include/wx/xrc/xmlreshandler.h @@ -105,6 +105,7 @@ public: virtual wxFont GetFont(const wxString& param = wxT("font"), wxWindow* parent = NULL) = 0; virtual bool GetBoolAttr(const wxString& attr, bool defaultv) = 0; + virtual wxString GetFilePath(const wxXmlNode* node) = 0; virtual void SetupWindow(wxWindow *wnd) = 0; virtual void CreateChildren(wxObject *parent, bool this_hnd_only = false) = 0; virtual void CreateChildrenPrivately(wxObject *parent, @@ -367,6 +368,10 @@ protected: { return GetImpl()->GetBoolAttr(attr, defaultv); } + wxString GetFilePath(const wxXmlNode* node) + { + return GetImpl()->GetFilePath(node); + } void SetupWindow(wxWindow *wnd) { GetImpl()->SetupWindow(wnd);