Some wxGrid related classes now support OOR.

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

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index b437a9b3e0a1c0e8c577e70bec4f44c1f2ecf6c1..1c344c68f8057c8857e48d943bdc7ecc46216b07 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


@@ -19,11 +19,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
 // 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
 
 #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


@@ -106,7 +109,9 @@
    bool MyApp::OnInit()
    {
       wxInitAllImageHandlers();
    bool MyApp::OnInit()
    {
       wxInitAllImageHandlers();

-
+#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB 
+      wxFileSystem::AddHandler(new wxZipFSHandler);
+#endif

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


@@ -133,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;


@@ -150,13 +156,21 @@
 
       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)
       if (! ret)

-         wxMessageBox("Failed adding book helpfiles/testing.hhp");
+        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)
       if (! ret)

-         wxMessageBox("Failed adding book helpfiles/another.hhp");
+        wxMessageBox("Failed adding book helpfiles/another.hhp");

    }
 
 
    }
 
 


@@ -170,7 +184,7 @@
 
    void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
    {
 
    void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
    {

-       help.Display("Main page");
+       help.Display("Test HELPFILE");

    }
 
    void MyFrame::OnClose(wxCloseEvent& event)
    }
 
    void MyFrame::OnClose(wxCloseEvent& event)