Avoid incompatible operand types

[wxWidgets.git] / samples / xrc / xrcdemo.cpp

diff --git a/samples/xrc/xrcdemo.cpp b/samples/xrc/xrcdemo.cpp
index a6a8a1a7c65c68952323f0ef668f27b4c62901e0..9a770d9804a783b148437a622f147d4b92c03cca 100644 (file)
--- a/samples/xrc/xrcdemo.cpp
+++ b/samples/xrc/xrcdemo.cpp
@@ -31,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 resouces
+#include "wx/xrc/xmlres.h"          // XRC XML resources
 
-//-----------------------------------------------------------------------------
+#include "wx/cshelp.h"              // wxSimpleHelpProvider for helptext
 
 #include "myframe.h"
 
@@ -62,11 +60,15 @@ 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()
+    // 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
@@ -79,28 +81,13 @@ 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
-    wxXmlResource::Get()->Load(wxT("rc/menu.xrc"));
-    // The toolbar
-    wxXmlResource::Get()->Load(wxT("rc/toolbar.xrc"));
-    // Non-derived dialog example
-    wxXmlResource::Get()->Load(wxT("rc/basicdlg.xrc"));
-    // Derived dialog example
-    wxXmlResource::Get()->Load(wxT("rc/derivdlg.xrc"));
-    // Controls property example
-    wxXmlResource::Get()->Load(wxT("rc/controls.xrc"));
-    // Frame example
-    wxXmlResource::Get()->Load(wxT("rc/frame.xrc"));
-    // Uncentered example
-    wxXmlResource::Get()->Load(wxT("rc/uncenter.xrc"));
-    // Custom class example
-    wxXmlResource::Get()->Load(wxT("rc/custclas.xrc"));
-    // wxArtProvider example
-    wxXmlResource::Get()->Load(wxT("rc/artprov.xrc"));
-    // Platform property example
-    wxXmlResource::Get()->Load(wxT("rc/platform.xrc"));
-    // Variable expansion example
-    wxXmlResource::Get()->Load(wxT("rc/variable.xrc"));
+    if ( !wxXmlResource::Get()->LoadAllFiles("rc") )
+        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 parent