wxFileSelector should have file name only, not path, passed to 3rd arg

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

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 6a0e3d3cdd0c3fc55fc968c4e80dd80936a71361..6ca6b236ee0313698c84a51b0254c0a868c5f8b8 100644 (file)
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -24,6 +24,8 @@
 
 #include <wx/image.h>
 #include <wx/wxhtml.h>
 
 #include <wx/image.h>
 #include <wx/wxhtml.h>

+#include <wx/filesys.h>
+#include <wx/fs_zip.h>

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -55,10 +57,9 @@
     // event handlers (these functions should _not_ be virtual)
       void OnQuit(wxCommandEvent& event);
       void OnHelp(wxCommandEvent& event);
     // event handlers (these functions should _not_ be virtual)
       void OnQuit(wxCommandEvent& event);
       void OnHelp(wxCommandEvent& event);

-
+      void OnClose(wxCloseEvent& event);

    private:
       wxHtmlHelpController help;
    private:
       wxHtmlHelpController help;

-      wxConfig* config;

    
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()
    
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()


@@ -86,6 +87,7 @@
    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
    EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
    EVT_MENU(Minimal_Help, MyFrame::OnHelp)
    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
    END_EVENT_TABLE()
 
    // Create a new application object: this macro will allow wxWindows to create


@@ -105,12 +107,12 @@
    // `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"); 

 
     // Create the main application window
       MyFrame *frame = new MyFrame("HTML Help Sample",
 
     // Create the main application window
       MyFrame *frame = new MyFrame("HTML Help Sample",


@@ -135,7 +137,7 @@
 
 // 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_DEFAULTSTYLE | wxHF_OPENFILES)

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


@@ -150,10 +152,15 @@
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
 

-      config = new wxConfig("wxHTMLhelp");
-
-      help.UseConfig(config);
-      help.AddBook("helpfiles/testing.hhp");
+      help.UseConfig(wxConfig::Get());
+      bool ret;
+      help.SetTempDir(".");
+      ret = help.AddBook("helpfiles/testing.hhp");
+      if (! ret)
+         wxMessageBox("Failed adding book helpfiles/testing.hhp");
+      ret = help.AddBook("helpfiles/another.hhp");
+      if (! ret)
+         wxMessageBox("Failed adding book helpfiles/another.hhp");

    }
 
 
    }
 
 


@@ -162,18 +169,25 @@
    void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
    {
     // TRUE is to force the frame to close
    void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
    {
     // TRUE is to force the frame to close

-      delete config;    

       Close(TRUE);
    }
 
       Close(TRUE);
    }
 

-
-
-

    void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
    {
        help.Display("Main page");
    }
 
    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);
+   }
+