X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c638c3cd124465f1e8bdc1fb19caba5b35003e83..c580f45efe9406261d537f2dada51650eb054be6:/samples/html/help/help.cpp

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 457fb96e0f..0e6ed46d88 100644
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -1,16 +1,15 @@
-
 /////////////////////////////////////////////////////////////////////////////
 // Name:        test.cpp
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
-#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
@@ -19,13 +18,14 @@
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP
-    #include <wx/wx.h>
+    #include "wx/wx.h"
 #endif
 
-#include <wx/image.h>
-#include <wx/wxhtml.h>
-#include <wx/filesys.h>
-#include <wx/fs_zip.h>
+#include "wx/image.h"
+#include "wx/html/helpfrm.h"
+#include "wx/html/helpctrl.h"
+#include "wx/filesys.h"
+#include "wx/fs_zip.h"
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -111,11 +111,11 @@
 #if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB 
       wxFileSystem::AddHandler(new wxZipFSHandler);
 #endif
-      SetVendorName("wxWindows");
-      SetAppName("wxHTMLHelp"); 
+      SetVendorName(wxT("wxWindows"));
+      SetAppName(wxT("wxHTMLHelp")); 
 
     // Create the main application window
-      MyFrame *frame = new MyFrame("HTML Help Sample",
+      MyFrame *frame = new MyFrame(_("HTML Help Sample"),
          wxPoint(50, 50), wxSize(150, 50));
 
     // Show it and tell the application that it's our main window
@@ -143,33 +143,25 @@
     // create a menu bar
       wxMenu *menuFile = new wxMenu;
 
-      menuFile->Append(Minimal_Help, "&Help");
-      menuFile->Append(Minimal_Quit, "E&xit");
+      menuFile->Append(Minimal_Help, _("&Help"));
+      menuFile->Append(Minimal_Quit, _("E&xit"));
 
     // now append the freshly created menu to the menu bar...
       wxMenuBar *menuBar = new wxMenuBar;
-      menuBar->Append(menuFile, "&File");
+      menuBar->Append(menuFile, _("&File"));
 
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
 
       help.UseConfig(wxConfig::Get());
       bool ret;
-#ifdef __WXMAC__
-      ret = help.AddBook(":helpfiles:testing.hhp");
-#else
-      help.SetTempDir(".");
-      ret = help.AddBook("helpfiles/testing.hhp");
-#endif
+      help.SetTempDir(wxT("."));
+      ret = help.AddBook(wxFileName(wxT("helpfiles/testing.hhp"), wxPATH_UNIX));
       if (! ret)
-	  wxMessageBox("Failed adding book helpfiles/testing.hhp");
-#ifdef __WXMAC__
-      ret = help.AddBook(":helpfiles:another.hhp");
-#else
-      ret = help.AddBook("helpfiles/another.hhp");
-#endif
+        wxMessageBox(wxT("Failed adding book helpfiles/testing.hhp"));
+      ret = help.AddBook(wxFileName(wxT("helpfiles/another.hhp"), wxPATH_UNIX));
       if (! ret)
-	  wxMessageBox("Failed adding book helpfiles/another.hhp");
+        wxMessageBox(_("Failed adding book helpfiles/another.hhp"));
    }
 
 
@@ -183,7 +175,7 @@
 
    void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
    {
-       help.Display("Main page");
+       help.Display(wxT("Test HELPFILE"));
    }
 
    void MyFrame::OnClose(wxCloseEvent& event)