minor clean up

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

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index ed81723f0ba061f5616020112f0beccd61d66a30..cd299a8bf38d8947bc002cff69227947541e7ef6 100644 (file)
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -21,44 +21,64 @@
     #include <wx/wx.h>
 #endif
 
     #include <wx/wx.h>
 #endif
 

-#include <wx/image.h>
-#include <wx/html/htmlwin.h>
+#include "wx/image.h"
+#include "wx/html/htmlwin.h"
+#include "wx/html/htmlproc.h"
+#include "wx/fs_inet.h"
+#include "wx/filedlg.h"

 
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 
 // Define a new application type, each program should derive a class from wxApp
 
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 
 // Define a new application type, each program should derive a class from wxApp

-   class MyApp : public wxApp
-   {
-   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)
-      virtual bool OnInit();
-   };
+class MyApp : public wxApp
+{
+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)
+   virtual bool OnInit();
+};

 
 // Define a new frame type: this is going to be our main frame
 
 // 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 OnAbout(wxCommandEvent& event);
-      void OnBack(wxCommandEvent& event);
-      void OnForward(wxCommandEvent& event);
-
-   private:
-        wxHtmlWindow *m_Html;
-    // any class wishing to process wxWindows events must use this macro
-    DECLARE_EVENT_TABLE()
-   };
+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 OnPageOpen(wxCommandEvent& event);
+    void OnBack(wxCommandEvent& event);
+    void OnForward(wxCommandEvent& event);
+    void OnProcessor(wxCommandEvent& event);
+
+private:
+     wxHtmlWindow *m_Html;
+     wxHtmlProcessor *m_Processor;
+ // any class wishing to process wxWindows events must use this macro
+ DECLARE_EVENT_TABLE()
+};
+
+
+class BoldProcessor : public wxHtmlProcessor
+{
+    public:
+        virtual wxString Process(const wxString& s) const
+        {
+            wxString r(s);
+            r.Replace(wxT("<b>"), wxEmptyString);
+            r.Replace(wxT("<B>"), wxEmptyString);
+            r.Replace(wxT("</b>"), wxEmptyString);
+            r.Replace(wxT("</B>"), wxEmptyString);
+            return r;
+        }       
+};

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -69,12 +89,13 @@
    {
     // menu items
    Minimal_Quit = 1,
    {
     // menu items
    Minimal_Quit = 1,

-   Minimal_About,
+   Minimal_PageOpen,

    Minimal_Back,
    Minimal_Forward,
    Minimal_Back,
    Minimal_Forward,

+   Minimal_Processor,

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

-   Minimal_Text = 1000,
+   Minimal_Text = 1000

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


@@ -86,9 +107,10 @@
 // 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)
    EVT_MENU(Minimal_Back, MyFrame::OnBack)
    EVT_MENU(Minimal_Forward, MyFrame::OnForward)

+   EVT_MENU(Minimal_Processor, MyFrame::OnProcessor)

    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


@@ -108,29 +130,24 @@
    // `Main program' equivalent: the program execution "starts" here
    bool MyApp::OnInit()
    {
    // `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
+     wxLog::AddTraceMask(wxT("strconv"));
+   
+     wxInitAllImageHandlers();
+     #if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS

      wxFileSystem::AddHandler(new wxInternetFSHandler);
      #endif
      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));
     // 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);
    
     // 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);
 
    
       SetTopWindow(frame);
 
    


@@ -153,7 +170,10 @@
       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_Processor, "&Remove bold attribute", "", TRUE);
+      

       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");


@@ -169,44 +189,46 @@
    
       CreateStatusBar(1);
 
    
       CreateStatusBar(1);
 

-      {
-      wxConfig *cfg = new wxConfig("wxHtmlTest");
+      m_Processor = new BoldProcessor;
+      m_Processor->Enable(FALSE);

       m_Html = new wxHtmlWindow(this);
       m_Html = new wxHtmlWindow(this);

-      m_Html -> SetRelatedFrame(this, "HTML : %s");
-      m_Html -> SetRelatedStatusBar(0);
-      m_Html -> ReadCustomization(cfg);
-      delete cfg;
-      m_Html -> LoadPage("test.htm");
-      }
+      m_Html->SetRelatedFrame(this, "HTML : %s");
+      m_Html->SetRelatedStatusBar(0);
+      m_Html->ReadCustomization(wxConfig::Get());
+      m_Html->LoadPage("test.htm");
+      m_Html->AddProcessor(m_Processor);

    }
 
 
 // event handlers
 
    }
 
 
 // event handlers
 

-   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;
-    Close(TRUE);
-   }
-
-   void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-   {
-     m_Html -> LoadPage("fft.html");
-   }
-
-
-
-   void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
-   {
-   if (!m_Html -> HistoryBack()) wxMessageBox("You reached prehistory era!");
-   }
-
-
-   void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event))
-   {
-   if (!m_Html -> HistoryForward()) wxMessageBox("No more items in history!");
-   }
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+ // TRUE is to force the frame to close
+ m_Html -> WriteCustomization(wxConfig::Get());
+ delete wxConfig::Set(NULL);
+ Close(TRUE);
+}
+
+void MyFrame::OnPageOpen(wxCommandEvent& WXUNUSED(event))
+{
+  wxString p = wxFileSelector("Open HTML document", "", "", "", "HTML files|*.htm");
+  if (p != wxEmptyString)
+    m_Html -> LoadPage(p);
+}
+
+void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
+{
+if (!m_Html -> HistoryBack()) wxMessageBox("You reached prehistory era!");
+}
+
+void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event))
+{
+if (!m_Html -> HistoryForward()) wxMessageBox("No more items in history!");
+}
+
+void MyFrame::OnProcessor(wxCommandEvent& WXUNUSED(event))
+{
+    m_Processor->Enable(!m_Processor->IsEnabled());
+    m_Html->LoadPage(m_Html->GetOpenedPage());
+}