X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f80ea77b4a8bac4ab005bfc592f9cd3262ffa397..623114052c4973e3fa9c09569bf3fece351729ed:/samples/xrc/xrcdemo.cpp diff --git a/samples/xrc/xrcdemo.cpp b/samples/xrc/xrcdemo.cpp index 64b0309f60..6c93d4b75b 100644 --- a/samples/xrc/xrcdemo.cpp +++ b/samples/xrc/xrcdemo.cpp @@ -7,14 +7,6 @@ // Licence: wxWindows licence //----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// GCC implementation -//----------------------------------------------------------------------------- - -#ifdef __GNUG__ - #pragma implementation "xrcdemo.h" -#endif - //----------------------------------------------------------------------------- // Standard wxWidgets headers //----------------------------------------------------------------------------- @@ -39,16 +31,14 @@ #include "xrcdemo.h" //----------------------------------------------------------------------------- -// Remaining headers: Needed wx headers, then wx/contrib headers, then application headers +// Remaining headers: Needed wx headers, then wx/contrib headers, then app one //----------------------------------------------------------------------------- #include "wx/image.h" // wxImage -//----------------------------------------------------------------------------- +#include "wx/xrc/xmlres.h" // XRC XML resources -#include "wx/xrc/xmlres.h" // XRC XML resouces - -//----------------------------------------------------------------------------- +#include "wx/cshelp.h" // wxSimpleHelpProvider for helptext #include "myframe.h" @@ -70,6 +60,9 @@ IMPLEMENT_APP(MyApp) // 'Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { + if ( !wxApp::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() @@ -88,34 +81,61 @@ bool MyApp::OnInit() // 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 - wxXmlResource::Get()->Load(wxT("rc/menu.xrc")); + if (!wxXmlResource::Get()->Load(wxT("rc/menu.xrc"))) + return false; + // The toolbar - wxXmlResource::Get()->Load(wxT("rc/toolbar.xrc")); + if (!wxXmlResource::Get()->Load(wxT("rc/toolbar.xrc"))) + return false; + // Non-derived dialog example - wxXmlResource::Get()->Load(wxT("rc/basicdlg.xrc")); + if (!wxXmlResource::Get()->Load(wxT("rc/basicdlg.xrc"))) + return false; + // Derived dialog example - wxXmlResource::Get()->Load(wxT("rc/derivdlg.xrc")); + if (!wxXmlResource::Get()->Load(wxT("rc/derivdlg.xrc"))) + return false; + // Controls property example - wxXmlResource::Get()->Load(wxT("rc/controls.xrc")); + if (!wxXmlResource::Get()->Load(wxT("rc/controls.xrc"))) + return false; + // Frame example - wxXmlResource::Get()->Load(wxT("rc/frame.xrc")); + if (!wxXmlResource::Get()->Load(wxT("rc/frame.xrc"))) + return false; + // Uncentered example - wxXmlResource::Get()->Load(wxT("rc/uncenter.xrc")); + if (!wxXmlResource::Get()->Load(wxT("rc/uncenter.xrc"))) + return false; + // Custom class example - wxXmlResource::Get()->Load(wxT("rc/custclas.xrc")); + if (!wxXmlResource::Get()->Load(wxT("rc/custclas.xrc"))) + return false; + // wxArtProvider example - wxXmlResource::Get()->Load(wxT("rc/artprov.xrc")); + if (!wxXmlResource::Get()->Load(wxT("rc/artprov.xrc"))) + return false; + // Platform property example - wxXmlResource::Get()->Load(wxT("rc/platform.xrc")); + if (!wxXmlResource::Get()->Load(wxT("rc/platform.xrc"))) + return false; + // Variable expansion example - wxXmlResource::Get()->Load(wxT("rc/variable.xrc")); + 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 ); +#endif // wxUSE_HELP // Make an instance of your derived frame. Passing NULL (the default value - // of MyFrame's constructor is NULL) as the frame doesn't have a frame - // since it is the first window. + // of MyFrame's constructor is NULL) as the frame doesn't have a parent + // since it is the main application window. MyFrame *frame = new MyFrame(); - // Show the frame. + // Show the frame as it's created initially hidden. frame->Show(true); // Return true to tell program to continue (false would terminate).