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

added wxFrame* wxXmlResource::LoadFrame(parent,name)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-08-25 12:14:37 +00:00
parent ba201fa431
commit 4dd75a6aaf
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/src/xrc/xmlres.cpp
View File

@@ -171,10 +171,7 @@ wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name)
wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name) wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name)
{ {
wxDialog *dialog = new wxDialog; return (wxDialog*)CreateResFromNode(FindResource(name, wxT("wxDialog")), parent, NULL);
if (!LoadDialog(dialog, parent, name))
{ delete dialog; return NULL; }
else return dialog;
} }
bool wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name) bool wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name)

5
src/xrc/xmlres.cpp
View File

@@ -171,10 +171,7 @@ wxToolBar *wxXmlResource::LoadToolBar(wxWindow *parent, const wxString& name)
wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name) wxDialog *wxXmlResource::LoadDialog(wxWindow *parent, const wxString& name)
{ {
wxDialog *dialog = new wxDialog; return (wxDialog*)CreateResFromNode(FindResource(name, wxT("wxDialog")), parent, NULL);
if (!LoadDialog(dialog, parent, name))
{ delete dialog; return NULL; }
else return dialog;
} }
bool wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name) bool wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name)