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 f67150b423ba66dc60bef7b66352c3fbb81a8990..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


@@ -58,7 +60,6 @@
       void OnClose(wxCloseEvent& event);
    private:
       wxHtmlHelpController help;
       void OnClose(wxCloseEvent& event);
    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()


@@ -106,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",


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


@@ -151,10 +152,9 @@
     // ... 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.UseConfig(wxConfig::Get());

       bool ret;
       bool ret;

+      help.SetTempDir(".");

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


@@ -184,8 +184,8 @@
        if ( help.GetFrame() ) // returns NULL if no help frame active
            help.GetFrame()->Close(TRUE);
        // now we can safely delete the config pointer
        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();   
        event.Skip();   

+       delete wxConfig::Set(NULL);

    }
 
 
    }