X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45e6e6f8ab806b337dffeb3b52fec7eba3c845ef..23fd114fcd326ffa2a374cc6f107dac4fc876c63:/samples/xrc/xrcdemo.cpp diff --git a/samples/xrc/xrcdemo.cpp b/samples/xrc/xrcdemo.cpp index 6c93d4b75b..9a770d9804 100644 --- a/samples/xrc/xrcdemo.cpp +++ b/samples/xrc/xrcdemo.cpp @@ -64,10 +64,11 @@ bool MyApp::OnInit() return false; // If there is any of a certain format of image in the xrcs, then first - // load a handler for that image type. This example uses XPMs, but if - // you want PNGs, then add a PNG handler, etc. See wxImage::AddHandler() + // load a handler for that image type. This example uses XPMs & a gif, but + // if you want PNGs, then add a PNG handler, etc. See wxImage::AddHandler() // documentation for the types of image handlers available. wxImage::AddHandler(new wxXPMHandler); + wxImage::AddHandler(new wxGIFHandler); // Initialize all the XRC handlers. Always required (unless you feel like // going through and initializing a handler of each control type you will @@ -80,51 +81,9 @@ bool MyApp::OnInit() // Load all of the XRC files that will be used. You can put everything // into one giant XRC file if you wanted, but then they become more // diffcult to manage, and harder to reuse in later projects. - // The menubar - if (!wxXmlResource::Get()->Load(wxT("rc/menu.xrc"))) + if ( !wxXmlResource::Get()->LoadAllFiles("rc") ) return false; - // The toolbar - if (!wxXmlResource::Get()->Load(wxT("rc/toolbar.xrc"))) - return false; - - // Non-derived dialog example - if (!wxXmlResource::Get()->Load(wxT("rc/basicdlg.xrc"))) - return false; - - // Derived dialog example - if (!wxXmlResource::Get()->Load(wxT("rc/derivdlg.xrc"))) - return false; - - // Controls property example - if (!wxXmlResource::Get()->Load(wxT("rc/controls.xrc"))) - return false; - - // Frame example - if (!wxXmlResource::Get()->Load(wxT("rc/frame.xrc"))) - return false; - - // Uncentered example - if (!wxXmlResource::Get()->Load(wxT("rc/uncenter.xrc"))) - return false; - - // Custom class example - if (!wxXmlResource::Get()->Load(wxT("rc/custclas.xrc"))) - return false; - - // wxArtProvider example - if (!wxXmlResource::Get()->Load(wxT("rc/artprov.xrc"))) - return false; - - // Platform property example - if (!wxXmlResource::Get()->Load(wxT("rc/platform.xrc"))) - return false; - - // Variable expansion example - if (!wxXmlResource::Get()->Load(wxT("rc/variable.xrc"))) - return false; - - #if wxUSE_HELP // Use the simple help provider to show the context-sensitive help wxHelpProvider::Set( new wxSimpleHelpProvider );