Make a couple virtuals protected so they can be overridden.

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

diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index 71914be05a0e6b1fe762f5dfba7cf82e861613fc..6f62d337637332e4c88fe681dbfd61c3580a6828 100644 (file)
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -1,15 +1,16 @@
-

 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpview.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpview.cpp

-// Purpose:     wxHtml help browser
-// Please note: see utils/helpview for a more fully-featured
-// standalone help browser.
+// Purpose:     wxHtml sample: help browser
+// Author:      ?
+// Modified by:
+// Created:     ?
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "help.cpp"
-#pragma interface "help.cpp"
-#endif
+// Please note: see utils/helpview for a more fully-featured
+// standalone help browser.

 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"


@@ -19,7 +20,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 #endif
 
 // for all others, include the necessary headers (this file is usually all you

-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers

 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif


@@ -30,27 +31,27 @@
 #include "wx/log.h"
 #include "wx/filedlg.h"
 
 #include "wx/log.h"
 #include "wx/filedlg.h"
 

+

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

-

 // Define a new application type, each program should derive a class from wxApp
 class MyApp : public wxApp
 {
 // Define a new application type, each program should derive a class from wxApp
 class MyApp : public wxApp
 {

-    public:
-        // override base class virtuals
-        // ----------------------------
+public:
+    // override base class virtuals
+    // ----------------------------

 
 

-        // this one is called on application startup and is a good place for the app
-        // initialization (doing it here and not in the ctor allows to have an error
-        // return: if OnInit() returns false, the application terminates)
+    // this one is called on application startup and is a good place for the app
+    // initialization (doing it here and not in the ctor allows to have an error
+    // return: if OnInit() returns false, the application terminates)

 
 

-        virtual bool OnInit();
-        virtual int OnExit();
+    virtual bool OnInit();
+    virtual int OnExit();

 
 

-    private:
-        wxHtmlHelpController *help;
+private:
+    wxHtmlHelpController *help;

 };
 
 
 };
 
 


@@ -66,8 +67,8 @@ bool MyApp::OnInit()
     wxInitAllImageHandlers();
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
     wxInitAllImageHandlers();
     wxFileSystem::AddHandler(new wxZipFSHandler);
 

-    SetVendorName("wxWindows");
-    SetAppName("wxHTMLHelp"); 
+    SetVendorName(wxT("wxWidgets"));
+    SetAppName(wxT("wxHTMLHelp"));

     wxConfig::Get(); // create an instance
 
     help = new wxHtmlHelpController;
     wxConfig::Get(); // create an instance
 
     help = new wxHtmlHelpController;


@@ -75,22 +76,23 @@ bool MyApp::OnInit()
     if (argc < 2) {
         wxLogError(wxT("Usage : helpview <helpfile> [<more helpfiles>]"));
         wxLogError(wxT("  helpfile may be .hhp, .zip or .htb"));
     if (argc < 2) {
         wxLogError(wxT("Usage : helpview <helpfile> [<more helpfiles>]"));
         wxLogError(wxT("  helpfile may be .hhp, .zip or .htb"));

-        return FALSE;
+        return false;

     }
 
     for (int i = 1; i < argc; i++)
     }
 
     for (int i = 1; i < argc; i++)

-        help -> AddBook(argv[i]);
+        help->AddBook(wxFileName(argv[i]));

 
 #ifdef __WXMOTIF__
     delete wxLog::SetActiveTarget(new wxLogGui);
 #endif
 
 
 #ifdef __WXMOTIF__
     delete wxLog::SetActiveTarget(new wxLogGui);
 #endif
 

+    help->SetShouldPreventAppExit(true);
+

     help -> DisplayContents();
 
     help -> DisplayContents();
 

-    return TRUE;
+    return true;

 }
 
 }
 

-

 int MyApp::OnExit()
 {
     delete help;
 int MyApp::OnExit()
 {
     delete help;