X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ec2b48446fa4f17187dcd73c3a314e4030333f6..6582b6ed83c452ab65ae8b5f3b780adc14f5f27f:/samples/html/help/help.cpp

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index fc9e3d71a3..a5169d92aa 100644
--- 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
@@ -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
-    #include <wx/wx.h>
+    #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
@@ -55,10 +58,9 @@
     // event handlers (these functions should _not_ be virtual)
       void OnQuit(wxCommandEvent& event);
       void OnHelp(wxCommandEvent& event);
-
+      void OnClose(wxCloseEvent& event);
    private:
       wxHtmlHelpController help;
-      wxConfig* config;
    
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()
@@ -86,6 +88,7 @@
    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
    EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
    EVT_MENU(Minimal_Help, MyFrame::OnHelp)
+   EVT_CLOSE(MyFrame::OnClose)
    END_EVENT_TABLE()
 
    // Create a new application object: this macro will allow wxWindows to create
@@ -105,12 +108,12 @@
    // `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"); 
 
     // Create the main application window
       MyFrame *frame = new MyFrame("HTML Help Sample",
@@ -135,7 +138,8 @@
 
 // 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;
@@ -150,14 +154,21 @@
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
 
-      config = new wxConfig("wxHTMLhelp");
-
-      help.UseConfig(config);
+      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");
    }
@@ -168,18 +179,25 @@
    void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
    {
     // TRUE is to force the frame to close
-      delete config;    
       Close(TRUE);
    }
 
-
-
-
    void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
    {
        help.Display("Main page");
    }
 
+   void MyFrame::OnClose(wxCloseEvent& event)
+   {
+       // Close the help frame; this will cause the config data to
+       // get written.
+       if ( help.GetFrame() ) // returns NULL if no help frame active
+           help.GetFrame()->Close(TRUE);
+       // now we can safely delete the config pointer
+       event.Skip();   
+       delete wxConfig::Set(NULL);
+   }
+