fixed bug in parsing formats in which fields don't have any non-numeric delimiters

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

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 4c17088e67ae417560723343acbd45aa44449c37..ac000fe7dc5e3570939f4572908a720e0f3fc91f 100644 (file)
--- 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
@@ -155,13 +155,21 @@
 
       help.UseConfig(wxConfig::Get());
       bool ret;
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+      ret = help.AddBook(":helpfiles:testing.hhp");
+#else
       help.SetTempDir(".");
       ret = help.AddBook("helpfiles/testing.hhp");
+#endif
       if (! ret)
-         wxMessageBox("Failed adding book helpfiles/testing.hhp");
+        wxMessageBox("Failed adding book helpfiles/testing.hhp");
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+      ret = help.AddBook(":helpfiles:another.hhp");
+#else
       ret = help.AddBook("helpfiles/another.hhp");
+#endif
       if (! ret)
-         wxMessageBox("Failed adding book helpfiles/another.hhp");
+        wxMessageBox("Failed adding book helpfiles/another.hhp");
    }
 
 
@@ -175,7 +183,7 @@
 
    void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
    {
-       help.Display("Main page");
+       help.Display("Test HELPFILE");
    }
 
    void MyFrame::OnClose(wxCloseEvent& event)