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 a150939d3fe02697303e4a4bf7e38af6258c9894..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".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -22,8 +22,11 @@
     #include <wx/wx.h>
 #endif
 
     #include <wx/wx.h>
 #endif
 

-#include <wx/image.h>
-#include <wx/wxhtml.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
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -105,13 +108,10 @@
    // `Main program' equivalent: the program execution "starts" here
    bool MyApp::OnInit()
    {
    // `Main program' equivalent: the program execution "starts" here
    bool MyApp::OnInit()
    {

-       #if wxUSE_LIBPNG
-        wxImage::AddHandler(new wxPNGHandler);
-       #endif
-       #if wxUSE_LIBJPEG
-        wxImage::AddHandler(new wxJPEGHandler);
-       #endif
-
+      wxInitAllImageHandlers();
+#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB 
+      wxFileSystem::AddHandler(new wxZipFSHandler);
+#endif

       SetVendorName("wxWindows");
       SetAppName("wxHTMLHelp"); 
 
       SetVendorName("wxWindows");
       SetAppName("wxHTMLHelp"); 
 


@@ -138,7 +138,8 @@
 
 // frame constructor
    MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 // frame constructor
    MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)

-   : wxFrame((wxFrame *)NULL, -1, title, pos, size), help()
+   : wxFrame((wxFrame *)NULL, -1, title, pos, size), 
+     help(wxHF_DEFAULT_STYLE | wxHF_OPEN_FILES)

    {
     // create a menu bar
       wxMenu *menuFile = new wxMenu;
    {
     // create a menu bar
       wxMenu *menuFile = new wxMenu;


@@ -155,11 +156,19 @@
 
       help.UseConfig(wxConfig::Get());
       bool ret;
 
       help.UseConfig(wxConfig::Get());
       bool ret;

+#ifdef __WXMAC__
+      ret = help.AddBook(":helpfiles:testing.hhp");
+#else

       help.SetTempDir(".");
       ret = help.AddBook("helpfiles/testing.hhp");
       help.SetTempDir(".");
       ret = help.AddBook("helpfiles/testing.hhp");

+#endif

       if (! ret)
          wxMessageBox("Failed adding book helpfiles/testing.hhp");
       if (! ret)
          wxMessageBox("Failed adding book helpfiles/testing.hhp");

+#ifdef __WXMAC__
+      ret = help.AddBook(":helpfiles:another.hhp");
+#else

       ret = help.AddBook("helpfiles/another.hhp");
       ret = help.AddBook("helpfiles/another.hhp");

+#endif

       if (! ret)
          wxMessageBox("Failed adding book helpfiles/another.hhp");
    }
       if (! ret)
          wxMessageBox("Failed adding book helpfiles/another.hhp");
    }