X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd6882eed7606652db9c6ea0cd90cb2986f7dd73..f3412ea74858605b2d52c97a2c916ffca8d55c98:/samples/html/test/test.cpp

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index ed81723f0b..a7130fcb79 100644
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -23,6 +23,7 @@
 
 #include <wx/image.h>
 #include <wx/html/htmlwin.h>
+#include <wx/fs_inet.h>
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -50,7 +51,7 @@
    
     // 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);
 
@@ -69,12 +70,12 @@
    {
     // menu items
    Minimal_Quit = 1,
-   Minimal_About,
+   Minimal_PageOpen,
    Minimal_Back,
    Minimal_Forward,
    
     // controls start here (the numbers are, of course, arbitrary)
-   Minimal_Text = 1000,
+   Minimal_Text = 1000
    };
 
 // ----------------------------------------------------------------------------
@@ -86,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)
-   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()
@@ -108,29 +109,22 @@
    // `Main program' equivalent: the program execution "starts" here
    bool MyApp::OnInit()
    {
-     wxLogDebug("[starting testing app]");
-     #if wxUSE_LIBPNG
-     wxImage::AddHandler(new wxPNGHandler);
-     #endif
-     #if wxUSE_LIBJPEG
-     wxImage::AddHandler(new wxJPEGHandler);
-     #endif
-     #if wxUSE_GIF
-     wxImage::AddHandler(new wxGIFHandler);
-     #endif
-     #if wxUSE_FS_INET
+     wxInitAllImageHandlers();
+     #if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS
      wxFileSystem::AddHandler(new wxInternetFSHandler);
      #endif
+
+      SetVendorName("wxWindows");
+      SetAppName("wxHtmlTest"); 
+      // the following call to wxConfig::Get will use it to create an object...
+
     // Create the main application window
       MyFrame *frame = new MyFrame("wxHtmlWindow testing application",
          wxPoint(50, 50), wxSize(640, 480));
-      MyFrame *frame2 = new MyFrame("wxHtmlWindow testing application, frame 2",
-         wxPoint(150, 50), wxSize(320, 240));
    
     // 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);
-      frame2->Show(TRUE);
       SetTopWindow(frame);
 
    
@@ -153,7 +147,7 @@
       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");
@@ -169,15 +163,11 @@
    
       CreateStatusBar(1);
 
-      {
-      wxConfig *cfg = new wxConfig("wxHtmlTest");
       m_Html = new wxHtmlWindow(this);
       m_Html -> SetRelatedFrame(this, "HTML : %s");
       m_Html -> SetRelatedStatusBar(0);
-      m_Html -> ReadCustomization(cfg);
-      delete cfg;
+      m_Html -> ReadCustomization(wxConfig::Get());
       m_Html -> LoadPage("test.htm");
-      }
    }
 
 
@@ -186,16 +176,16 @@
    void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
    {
     // TRUE is to force the frame to close
-    wxLogDebug("about to save config...");
-    wxConfig *cfg = new wxConfig("wxHtmlTest");
-    m_Html -> WriteCustomization(cfg);
-    delete cfg;
+    m_Html -> WriteCustomization(wxConfig::Get());
+    delete wxConfig::Set(NULL);
     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);
    }