removed wxXmlResource::GetFirstRoot for reasons explained at wx-dev
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -115,10 +115,6 @@ public:
|
|||||||
// Destructor.
|
// Destructor.
|
||||||
~wxXmlResource();
|
~wxXmlResource();
|
||||||
|
|
||||||
// Gives access to the first root node for
|
|
||||||
// direct manipulation or querying
|
|
||||||
wxXmlNode *GetFirstRoot();
|
|
||||||
|
|
||||||
// Loads resources from XML files that match given filemask.
|
// Loads resources from XML files that match given filemask.
|
||||||
// This method understands VFS (see filesys.h).
|
// This method understands VFS (see filesys.h).
|
||||||
bool Load(const wxString& filemask);
|
bool Load(const wxString& filemask);
|
||||||
|
@@ -146,17 +146,6 @@ void wxXmlResource::ClearHandlers()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
wxXmlNode *wxXmlResource::GetFirstRoot()
|
|
||||||
{
|
|
||||||
UpdateResources(); //ensure everything is up-to-date
|
|
||||||
|
|
||||||
if (m_data.GetCount() == 0) return NULL;
|
|
||||||
|
|
||||||
if (m_data[0].Doc == NULL) return NULL;
|
|
||||||
|
|
||||||
return m_data[0].Doc->GetRoot();
|
|
||||||
}
|
|
||||||
|
|
||||||
wxMenu *wxXmlResource::LoadMenu(const wxString& name)
|
wxMenu *wxXmlResource::LoadMenu(const wxString& name)
|
||||||
{
|
{
|
||||||
return (wxMenu*)CreateResFromNode(FindResource(name, wxT("wxMenu")), NULL, NULL);
|
return (wxMenu*)CreateResFromNode(FindResource(name, wxT("wxMenu")), NULL, NULL);
|
||||||
|
@@ -115,10 +115,6 @@ public:
|
|||||||
// Destructor.
|
// Destructor.
|
||||||
~wxXmlResource();
|
~wxXmlResource();
|
||||||
|
|
||||||
// Gives access to the first root node for
|
|
||||||
// direct manipulation or querying
|
|
||||||
wxXmlNode *GetFirstRoot();
|
|
||||||
|
|
||||||
// Loads resources from XML files that match given filemask.
|
// Loads resources from XML files that match given filemask.
|
||||||
// This method understands VFS (see filesys.h).
|
// This method understands VFS (see filesys.h).
|
||||||
bool Load(const wxString& filemask);
|
bool Load(const wxString& filemask);
|
||||||
|
@@ -146,17 +146,6 @@ void wxXmlResource::ClearHandlers()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
wxXmlNode *wxXmlResource::GetFirstRoot()
|
|
||||||
{
|
|
||||||
UpdateResources(); //ensure everything is up-to-date
|
|
||||||
|
|
||||||
if (m_data.GetCount() == 0) return NULL;
|
|
||||||
|
|
||||||
if (m_data[0].Doc == NULL) return NULL;
|
|
||||||
|
|
||||||
return m_data[0].Doc->GetRoot();
|
|
||||||
}
|
|
||||||
|
|
||||||
wxMenu *wxXmlResource::LoadMenu(const wxString& name)
|
wxMenu *wxXmlResource::LoadMenu(const wxString& name)
|
||||||
{
|
{
|
||||||
return (wxMenu*)CreateResFromNode(FindResource(name, wxT("wxMenu")), NULL, NULL);
|
return (wxMenu*)CreateResFromNode(FindResource(name, wxT("wxMenu")), NULL, NULL);
|
||||||
|
Reference in New Issue
Block a user