added wxEncodingToCodepage() and implemented it properly (using in32 API instead...

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

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 4c17088e67ae417560723343acbd45aa44449c37..c96d603d4c1045661a56230263f2423800b37874 100644 (file)
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -10,7 +10,7 @@
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -22,10 +22,11 @@
     #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,11 +156,19 @@
 
       help.UseConfig(wxConfig::Get());
       bool ret;
+#ifdef __WXMAC__
+      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");
+#ifdef __WXMAC__
+      ret = help.AddBook(":helpfiles:another.hhp");
+#else
       ret = help.AddBook("helpfiles/another.hhp");
+#endif
       if (! ret)
          wxMessageBox("Failed adding book helpfiles/another.hhp");
    }