X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23bc3597eb2e31f17946bccd394e4d5ff7a99574..2ac47b9e4b630d833453e3b0e1085f97d462e098:/samples/xrc/xrcdemo.cpp?ds=sidebyside

diff --git a/samples/xrc/xrcdemo.cpp b/samples/xrc/xrcdemo.cpp
index d7d2a0966b..6c93d4b75b 100644
--- a/samples/xrc/xrcdemo.cpp
+++ b/samples/xrc/xrcdemo.cpp
@@ -60,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()
@@ -78,27 +81,49 @@ 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