Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wxXmlResourceHandler::GetFilePath()

Browse Source 
The function already implemented in wxXmlResourceHandlerImpl. Just make it
accessible from wxXmlResourceHandler.
This commit is contained in:
Ilya Sinitsyn
2020-06-09 21:30:59 +07:00
parent de2fba540b
commit cc5fb63bf7
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/xrc/xmlres.h
View File

@@ -603,7 +603,7 @@ public:
// Gets a file path from the given node, expanding environment variables in // Gets a file path from the given node, expanding environment variables in
// it if wxXRC_USE_ENVVARS is in use. // 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). // Returns the window associated with the handler (may be NULL).
wxWindow* GetParentAsWindow() const { return m_handler->GetParentAsWindow(); } wxWindow* GetParentAsWindow() const { return m_handler->GetParentAsWindow(); }

5
include/wx/xrc/xmlreshandler.h
View File

@@ -105,6 +105,7 @@ public:
virtual wxFont GetFont(const wxString& param = wxT("font"), wxWindow* parent = NULL) = 0; virtual wxFont GetFont(const wxString& param = wxT("font"), wxWindow* parent = NULL) = 0;
virtual bool GetBoolAttr(const wxString& attr, bool defaultv) = 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 SetupWindow(wxWindow *wnd) = 0;
virtual void CreateChildren(wxObject *parent, bool this_hnd_only = false) = 0; virtual void CreateChildren(wxObject *parent, bool this_hnd_only = false) = 0;
virtual void CreateChildrenPrivately(wxObject *parent, virtual void CreateChildrenPrivately(wxObject *parent,
@@ -367,6 +368,10 @@ protected:
{ {
return GetImpl()->GetBoolAttr(attr, defaultv); return GetImpl()->GetBoolAttr(attr, defaultv);
} }
wxString GetFilePath(const wxXmlNode* node)
{
return GetImpl()->GetFilePath(node);
}
void SetupWindow(wxWindow *wnd) void SetupWindow(wxWindow *wnd)
{ {
GetImpl()->SetupWindow(wnd); GetImpl()->SetupWindow(wnd);