X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62877de0ed937926a3e8aaef615380d5c6c2cfbe..14dd645ee16eb022afb19f35d0c8cfdf2d3cdee9:/samples/html/helpview/helpview.cpp

diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index feacd02b99..f8cb26d42a 100644
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -25,6 +25,7 @@
 #include <wx/image.h>
 #include <wx/wxhtml.h>
 #include <wx/fs_zip.h>
+#include <wx/log.h>
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -47,7 +48,6 @@ class MyApp : public wxApp
 
     private:
         wxHtmlHelpController *help;
-        wxConfig* config;
 };
 
 
@@ -56,22 +56,32 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
+#ifdef __WXMOTIF__
+    delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
+#endif
+
     wxInitAllImageHandlers();
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
-    config = new wxConfig("wxHTMLhelp");
+    SetVendorName("wxWindows");
+    SetAppName("wxHTMLHelp"); 
+    wxConfig::Get(); // create an instance
+
     help = new wxHtmlHelpController;
-    help -> UseConfig(config);
     
     if (argc < 2) {
-        wxLogError("Usage : helpview <helpfile> [<more helpfiles>]");
-        wxLogError("  helpfile may be .hhp, .zip or .htb");
+        wxLogError(wxT("Usage : helpview <helpfile> [<more helpfiles>]"));
+        wxLogError(wxT("  helpfile may be .hhp, .zip or .htb"));
         return FALSE;
     }
 
     for (int i = 1; i < argc; i++)
         help -> AddBook(argv[i]);
 
+#ifdef __WXMOTIF__
+    delete wxLog::SetActiveTarget(new wxLogGui);
+#endif
+
     help -> DisplayContents();
 
     return TRUE;
@@ -81,7 +91,7 @@ bool MyApp::OnInit()
 int MyApp::OnExit()
 {
     delete help;
-    delete config;
+    delete wxConfig::Set(NULL);
 
     return 0;
 }