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

added singleton interface to wxXmlResource, replaces wxTheXmlResource

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-01-17 23:41:53 +00:00
parent d9ade1df2f
commit 824e8eaacc
8 changed files with 82 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/samples/xrc/xrcdemo.cpp
View File

@@ -111,8 +111,8 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit()
{
wxImage::AddHandler(new wxGIFHandler);
wxTheXmlResource->InitAllHandlers();
wxTheXmlResource->Load("rc/resource.xrc");
wxXmlResource::Get()->InitAllHandlers();
wxXmlResource::Get()->Load("rc/resource.xrc");
MyFrame *frame = new MyFrame("XML resources demo",
wxPoint(50, 50), wxSize(450, 340));
@@ -130,8 +130,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
{
SetIcon(wxICON(appicon));
SetMenuBar(wxTheXmlResource->LoadMenuBar("mainmenu"));
SetToolBar(wxTheXmlResource->LoadToolBar(this, "toolbar"));
SetMenuBar(wxXmlResource::Get()->LoadMenuBar("mainmenu"));
SetToolBar(wxXmlResource::Get()->LoadToolBar(this, "toolbar"));
}
@@ -155,7 +155,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnDlg1(wxCommandEvent& WXUNUSED(event))
{
wxDialog dlg;
wxTheXmlResource->LoadDialog(&dlg, this, "dlg1");
wxXmlResource::Get()->LoadDialog(&dlg, this, "dlg1");
dlg.ShowModal();
}
@@ -163,6 +163,6 @@ void MyFrame::OnDlg1(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnDlg2(wxCommandEvent& WXUNUSED(event))
{
wxDialog dlg;
wxTheXmlResource->LoadDialog(&dlg, this, "dlg2");
wxXmlResource::Get()->LoadDialog(&dlg, this, "dlg2");
dlg.ShowModal();
}