Tcl regex lib

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

diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index feacd02b9971a8a8e7fb302c44a421278e08fb9e..71914be05a0e6b1fe762f5dfba7cf82e861613fc 100644 (file)
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -2,6 +2,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpview.cpp
 // Purpose:     wxHtml help browser
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpview.cpp
 // Purpose:     wxHtml help browser

+// Please note: see utils/helpview for a more fully-featured
+// standalone help browser.

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -10,7 +12,7 @@
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop


@@ -19,12 +21,14 @@
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP

-#include <wx/wx.h>
+#include "wx/wx.h"

 #endif
 
 #endif
 

-#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"
+#include "wx/filedlg.h"

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


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

-        wxConfig* config;

 };
 
 
 };
 
 


@@ -56,22 +59,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 +94,7 @@ bool MyApp::OnInit()
 int MyApp::OnExit()
 {
     delete help;
 int MyApp::OnExit()
 {
     delete help;

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

 
     return 0;
 }
 
     return 0;
 }