2.5.1, not 2.5.2

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

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 6a0e3d3cdd0c3fc55fc968c4e80dd80936a71361..0e6ed46d888ebd9bd63c200f70da6e094dacb7ad 100644 (file)
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -1,16 +1,15 @@
-

 /////////////////////////////////////////////////////////////////////////////
 // Name:        test.cpp
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 // Name:        test.cpp
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma implementation "help.cpp"
     #pragma interface "help.cpp"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
     #pragma implementation "help.cpp"
     #pragma interface "help.cpp"
 #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 +18,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


@@ -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,15 +107,15 @@
    // `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(wxT("wxWindows"));
+      SetAppName(wxT("wxHTMLHelp")); 

 
     // Create the main application window
 
     // Create the main application window

-      MyFrame *frame = new MyFrame("HTML Help Sample",
+      MyFrame *frame = new MyFrame(_("HTML Help Sample"),

          wxPoint(50, 50), wxSize(150, 50));
 
     // Show it and tell the application that it's our main window
          wxPoint(50, 50), wxSize(150, 50));
 
     // Show it and tell the application that it's our main window


@@ -135,25 +137,31 @@
 
 // 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;
 

-      menuFile->Append(Minimal_Help, "&Help");
-      menuFile->Append(Minimal_Quit, "E&xit");
+      menuFile->Append(Minimal_Help, _("&Help"));
+      menuFile->Append(Minimal_Quit, _("E&xit"));

 
     // now append the freshly created menu to the menu bar...
       wxMenuBar *menuBar = new wxMenuBar;
 
     // now append the freshly created menu to the menu bar...
       wxMenuBar *menuBar = new wxMenuBar;

-      menuBar->Append(menuFile, "&File");
+      menuBar->Append(menuFile, _("&File"));

 
     // ... 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(wxT("."));
+      ret = help.AddBook(wxFileName(wxT("helpfiles/testing.hhp"), wxPATH_UNIX));
+      if (! ret)
+        wxMessageBox(wxT("Failed adding book helpfiles/testing.hhp"));
+      ret = help.AddBook(wxFileName(wxT("helpfiles/another.hhp"), wxPATH_UNIX));
+      if (! ret)
+        wxMessageBox(_("Failed adding book helpfiles/another.hhp"));

    }
 
 
    }
 
 


@@ -162,16 +170,23 @@
    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))
    {
    void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
    {

-       help.Display("Main page");
+       help.Display(wxT("Test HELPFILE"));
+   }
+
+   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);

    }
 
 
    }