X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5612e5243e278e50c0103c9f9341542c037d93e2..adb799d6ef8e1ba754ab08b26e64fa40219f95f8:/samples/html/helpview/helpview.cpp

diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index a6165db270..7a01bbf561 100644
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -1,31 +1,33 @@
-
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpview.cpp
 // Purpose:     wxHtml help browser
+// Please note: see utils/helpview for a more fully-featured
+// standalone help browser.
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma implementation "help.cpp"
 #pragma interface "help.cpp"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #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 +65,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("Usage : helpview <helpfile> [<more helpfiles>]");
-        wxLogError("  helpfile may be .hhp, .zip or .htb");
-        return FALSE;
+        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]);
+        help->AddBook(wxFileName(argv[i]));
 
 #ifdef __WXMOTIF__
     delete wxLog::SetActiveTarget(new wxLogGui);
@@ -84,7 +86,7 @@ bool MyApp::OnInit()
 
     help -> DisplayContents();
 
-    return TRUE;
+    return true;
 }