mingw compilation fix

[wxWidgets.git] / samples / html / helpview / helpview.cpp

diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index feacd02b9971a8a8e7fb302c44a421278e08fb9e..f8cb26d42ade60a9ac07be8d0e348cc31ab25368 100644 (file)
--- 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/image.h>
 #include <wx/wxhtml.h>
 #include <wx/fs_zip.h>

+#include <wx/log.h>

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -47,7 +48,6 @@ class MyApp : public wxApp
 
     private:
         wxHtmlHelpController *help;
 
     private:
         wxHtmlHelpController *help;

-        wxConfig* config;

 };
 
 
 };
 
 


@@ -56,22 +56,32 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

+#ifdef __WXMOTIF__
+    delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
+#endif
+

     wxInitAllImageHandlers();
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
     wxInitAllImageHandlers();
     wxFileSystem::AddHandler(new wxZipFSHandler);
 

-    config = new wxConfig("wxHTMLhelp");
+    SetVendorName("wxWindows");
+    SetAppName("wxHTMLHelp"); 
+    wxConfig::Get(); // create an instance
+

     help = new wxHtmlHelpController;
     help = new wxHtmlHelpController;

-    help -> UseConfig(config);

     
     if (argc < 2) {
     
     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]);
 
         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;
     help -> DisplayContents();
 
     return TRUE;


@@ -81,7 +91,7 @@ bool MyApp::OnInit()
 int MyApp::OnExit()
 {
     delete help;
 int MyApp::OnExit()
 {
     delete help;

-    delete config;
+    delete wxConfig::Set(NULL);

 
     return 0;
 }
 
     return 0;
 }