Fix wrong configure test for abi::__forced_unwind in previous commit.

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

diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index 7a01bbf5612b90b56816ee8c1326521c454e5fd6..6f62d337637332e4c88fe681dbfd61c3580a6828 100644 (file)
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -1,14 +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

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

-#if defined(__GNUG__) && !defined(__APPLE__)
-#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"


@@ -29,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,7 +68,7 @@ bool MyApp::OnInit()
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
     SetVendorName(wxT("wxWidgets"));
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
     SetVendorName(wxT("wxWidgets"));

-    SetAppName(wxT("wxHTMLHelp")); 
+    SetAppName(wxT("wxHTMLHelp"));

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


@@ -84,12 +86,13 @@ bool MyApp::OnInit()
     delete wxLog::SetActiveTarget(new wxLogGui);
 #endif
 
     delete wxLog::SetActiveTarget(new wxLogGui);
 #endif
 

+    help->SetShouldPreventAppExit(true);
+

     help -> DisplayContents();
 
     return true;
 }
 
     help -> DisplayContents();
 
     return true;
 }
 

-

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