now has 'help' item in menu

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 22677fee69feedb5a1833506c14c1da13ebf3b74..6a0e3d3cdd0c3fc55fc968c4e80dd80936a71361 100644 (file)
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -1,11 +1,12 @@
+

 /////////////////////////////////////////////////////////////////////////////
 // Name:        test.cpp
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 // Name:        test.cpp
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-    #pragma implementation
-    #pragma interface
+    #pragma implementation "help.cpp"
+    #pragma interface "help.cpp"

 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -23,62 +24,158 @@
 
 #include <wx/image.h>
 #include <wx/wxhtml.h>
 
 #include <wx/image.h>
 #include <wx/wxhtml.h>

-#if (( wxVERSION_NUMBER < 2100 ) || (( wxVERSION_NUMBER == 2100 ) && (wxBETA_NUMBER <= 4)))
-#include <wx/imaggif.h>
-#endif
-#include <wx/config.h>

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

+

 // Define a new application type, each program should derive a class from wxApp
    class MyApp : public wxApp
    {
 // Define a new application type, each program should derive a class from wxApp
    class MyApp : public wxApp
    {

-   private:
-        wxHtmlHelpController help;
-       wxConfig* config;
-

    public:
     // override base class virtuals
     // ----------------------------
    public:
     // override base class virtuals
     // ----------------------------

-   
+

     // this one is called on application startup and is a good place for the app
     // initialization (doing it here and not in the ctor allows to have an error
     // return: if OnInit() returns false, the application terminates)
     // this one is called on application startup and is a good place for the app
     // initialization (doing it here and not in the ctor allows to have an error
     // return: if OnInit() returns false, the application terminates)

-      bool OnInit();
-      int OnExit();
+      virtual bool OnInit();

    };
 
    };
 

-   IMPLEMENT_APP(MyApp)
+
+
+// Define a new frame type: this is going to be our main frame
+   class MyFrame : public wxFrame
+   {
+   public:
+    // ctor(s)
+      MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+
+    // event handlers (these functions should _not_ be virtual)
+      void OnQuit(wxCommandEvent& event);
+      void OnHelp(wxCommandEvent& event);
+
+   private:
+      wxHtmlHelpController help;
+      wxConfig* config;

    
    

+    // any class wishing to process wxWindows events must use this macro
+    DECLARE_EVENT_TABLE()
+   };
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// IDs for the controls and the menu commands
+   enum
+   {
+    // menu items
+   Minimal_Quit = 1,
+   Minimal_Help
+   };
+
+// ----------------------------------------------------------------------------
+// event tables and other macros for wxWindows
+// ----------------------------------------------------------------------------

 
 

+// the event tables connect the wxWindows events with the functions (event
+// handlers) which process them. It can be also done at run-time, but for the
+// simple menu events like this the static method is much simpler.
+   BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+   EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
+   EVT_MENU(Minimal_Help, MyFrame::OnHelp)
+   END_EVENT_TABLE()
+
+   // Create a new application object: this macro will allow wxWindows to create
+   // the application object during program execution (it's better than using a
+   // static object for many reasons) and also declares the accessor function
+   // wxGetApp() which will return the reference of the right type (i.e. MyApp and
+   // not wxApp)
+   IMPLEMENT_APP(MyApp)
+
+   // ============================================================================
+   // implementation
+   // ============================================================================
+
+   // ----------------------------------------------------------------------------
+   // the application class
+   // ----------------------------------------------------------------------------
+   // `Main program' equivalent: the program execution "starts" here

    bool MyApp::OnInit()
    {
    bool MyApp::OnInit()
    {

-    config = new wxConfig("wxHTMLhelp");
-   #if wxUSE_LIBPNG
-    wxImage::AddHandler(new wxPNGHandler);
-   #endif
-   #if wxUSE_LIBJPEG
-    wxImage::AddHandler(new wxJPEGHandler);
-   #endif
-
-    help.UseConfig(config);
-    help.SetTempDir("tmp");
-    help.AddBook("helpfiles/testing.hhp");
-    help.Display("Main page");
+       #if wxUSE_LIBPNG
+        wxImage::AddHandler(new wxPNGHandler);
+       #endif
+       #if wxUSE_LIBJPEG
+        wxImage::AddHandler(new wxJPEGHandler);
+       #endif
+
+    // Create the main application window
+      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
+    // @@@ what does it do exactly, in fact? is it necessary here?
+      frame->Show(TRUE);
+      SetTopWindow(frame);
+
+
+    // success: wxApp::OnRun() will be called which will enter the main message
+    // loop and the application will run. If we returned FALSE here, the
+    // application would exit immediately.

       return TRUE;
    }
       return TRUE;
    }

-   
-   int MyApp::OnExit()
+
+// ----------------------------------------------------------------------------
+// main frame
+// ----------------------------------------------------------------------------
+
+
+// frame constructor
+   MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
+   : wxFrame((wxFrame *)NULL, -1, title, pos, size), help()
+   {
+    // create a menu bar
+      wxMenu *menuFile = new wxMenu;
+
+      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;
+      menuBar->Append(menuFile, "&File");
+
+    // ... and attach this menu bar to the frame
+      SetMenuBar(menuBar);
+
+      config = new wxConfig("wxHTMLhelp");
+
+      help.UseConfig(config);
+      help.AddBook("helpfiles/testing.hhp");
+   }
+
+
+// event handlers
+
+   void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))

    {
    {

-     delete config;
-     return 0;
+    // TRUE is to force the frame to close
+      delete config;    
+      Close(TRUE);

    }
 
 
 
 
    }
 
 
 
 

+   void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
+   {
+       help.Display("Main page");
+   }
+
+
+