X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92a19c2e7757ba742846f83e56356de0a607bdc2..bb8204ef8236a9d1f39516832947ea4081f22146:/samples/html/helpview/helpview.cpp?ds=sidebyside

diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index 3e1e1b1d21..ba4c62925d 100644
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -1,14 +1,10 @@
-
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpview.cpp
 // Purpose:     wxHtml help browser
+// Please note: see utils/helpview for a more fully-featured
+// standalone help browser.
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "help.cpp"
-#pragma interface "help.cpp"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -17,15 +13,16 @@
 #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>
+#include "wx/wx.h"
 #endif
 
-#include <wx/image.h>
-#include <wx/wxhtml.h>
-#include <wx/fs_zip.h>
-#include <wx/log.h>
+#include "wx/image.h"
+#include "wx/wxhtml.h"
+#include "wx/fs_zip.h"
+#include "wx/log.h"
+#include "wx/filedlg.h"
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -63,20 +60,20 @@ bool MyApp::OnInit()
     wxInitAllImageHandlers();
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
-    SetVendorName("wxWindows");
-    SetAppName("wxHTMLHelp"); 
+    SetVendorName(wxT("wxWidgets"));
+    SetAppName(wxT("wxHTMLHelp")); 
     wxConfig::Get(); // create an instance
 
     help = new wxHtmlHelpController;
-    
+
     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++)
-        help -> AddBook(argv[i]);
+        help->AddBook(wxFileName(argv[i]));
 
 #ifdef __WXMOTIF__
     delete wxLog::SetActiveTarget(new wxLogGui);
@@ -84,7 +81,7 @@ bool MyApp::OnInit()
 
     help -> DisplayContents();
 
-    return TRUE;
+    return true;
 }