Some new interfaces in common code requires an updated module definition file.

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

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index d738d480e1b81c221d4bff3751d95d9733acfcf6..a7130fcb7965383f688580cb1773a57e3e8a57f0 100644 (file)
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -51,7 +51,7 @@
    
     // event handlers (these functions should _not_ be virtual)
       void OnQuit(wxCommandEvent& event);
    
     // event handlers (these functions should _not_ be virtual)
       void OnQuit(wxCommandEvent& event);

-      void OnAbout(wxCommandEvent& event);
+      void OnPageOpen(wxCommandEvent& event);

       void OnBack(wxCommandEvent& event);
       void OnForward(wxCommandEvent& event);
 
       void OnBack(wxCommandEvent& event);
       void OnForward(wxCommandEvent& event);
 


@@ -70,12 +70,12 @@
    {
     // menu items
    Minimal_Quit = 1,
    {
     // menu items
    Minimal_Quit = 1,

-   Minimal_About,
+   Minimal_PageOpen,

    Minimal_Back,
    Minimal_Forward,
    
     // controls start here (the numbers are, of course, arbitrary)
    Minimal_Back,
    Minimal_Forward,
    
     // controls start here (the numbers are, of course, arbitrary)

-   Minimal_Text = 1000,
+   Minimal_Text = 1000

    };
 
 // ----------------------------------------------------------------------------
    };
 
 // ----------------------------------------------------------------------------


@@ -87,7 +87,7 @@
 // simple menu events like this the static method is much simpler.
    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
    EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
 // 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_About, MyFrame::OnAbout)
+   EVT_MENU(Minimal_PageOpen, MyFrame::OnPageOpen)

    EVT_MENU(Minimal_Back, MyFrame::OnBack)
    EVT_MENU(Minimal_Forward, MyFrame::OnForward)
    END_EVENT_TABLE()
    EVT_MENU(Minimal_Back, MyFrame::OnBack)
    EVT_MENU(Minimal_Forward, MyFrame::OnForward)
    END_EVENT_TABLE()


@@ -110,7 +110,7 @@
    bool MyApp::OnInit()
    {
      wxInitAllImageHandlers();
    bool MyApp::OnInit()
    {
      wxInitAllImageHandlers();

-     #if wxUSE_FS_INET
+     #if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS

      wxFileSystem::AddHandler(new wxInternetFSHandler);
      #endif
 
      wxFileSystem::AddHandler(new wxInternetFSHandler);
      #endif
 


@@ -147,7 +147,7 @@
       wxMenu *menuFile = new wxMenu;
       wxMenu *menuNav = new wxMenu;
 
       wxMenu *menuFile = new wxMenu;
       wxMenu *menuNav = new wxMenu;
 

-      menuFile->Append(Minimal_About, "&Load wxWindows manual page");
+      menuFile->Append(Minimal_PageOpen, "&Open HTML page...");

       menuFile->AppendSeparator();
       menuFile->Append(Minimal_Quit, "&Close frame");
       menuNav->Append(Minimal_Back, "Go &BACK");
       menuFile->AppendSeparator();
       menuFile->Append(Minimal_Quit, "&Close frame");
       menuNav->Append(Minimal_Back, "Go &BACK");


@@ -181,9 +181,11 @@
     Close(TRUE);
    }
 
     Close(TRUE);
    }
 

-   void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+   void MyFrame::OnPageOpen(wxCommandEvent& WXUNUSED(event))

    {
    {

-     m_Html -> LoadPage("fft.html");
+     wxString p = wxFileSelector("Open HTML document", "", "", "", "HTML files|*.htm");
+     if (p != wxEmptyString)
+       m_Html -> LoadPage(p);

    }
 
 
    }