made operator==() and \!=() const (still doesn't make them correct probably)

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

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index f67150b423ba66dc60bef7b66352c3fbb81a8990..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".
-#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
@@ -58,7 +61,6 @@
       void OnClose(wxCloseEvent& event);
    private:
       wxHtmlHelpController help;
-      wxConfig* config;
    
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()
@@ -106,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",
@@ -136,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;
@@ -151,16 +154,23 @@
     // ... 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");
+        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");
+        wxMessageBox("Failed adding book helpfiles/another.hhp");
    }
 
 
@@ -174,7 +184,7 @@
 
    void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
    {
-       help.Display("Main page");
+       help.Display("Test HELPFILE");
    }
 
    void MyFrame::OnClose(wxCloseEvent& event)
@@ -184,8 +194,8 @@
        if ( help.GetFrame() ) // returns NULL if no help frame active
            help.GetFrame()->Close(TRUE);
        // now we can safely delete the config pointer
-       delete config;
        event.Skip();   
+       delete wxConfig::Set(NULL);
    }