Added some missing samples

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

diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index 71914be05a0e6b1fe762f5dfba7cf82e861613fc..7a01bbf5612b90b56816ee8c1326521c454e5fd6 100644 (file)
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -1,4 +1,3 @@
-

 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpview.cpp
 // Purpose:     wxHtml help browser
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpview.cpp
 // Purpose:     wxHtml help browser


@@ -6,7 +5,7 @@
 // standalone help browser.
 /////////////////////////////////////////////////////////////////////////////
 
 // standalone help browser.
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma implementation "help.cpp"
 #pragma interface "help.cpp"
 #endif
 #pragma implementation "help.cpp"
 #pragma interface "help.cpp"
 #endif


@@ -19,7 +18,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


@@ -66,8 +65,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,11 +74,11 @@ 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);
 
 #ifdef __WXMOTIF__
     delete wxLog::SetActiveTarget(new wxLogGui);


@@ -87,7 +86,7 @@ bool MyApp::OnInit()
 
     help -> DisplayContents();
 
 
     help -> DisplayContents();
 

-    return TRUE;
+    return true;

 }
 
 
 }