X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5526e819eca4465ed5520d49bccfebc6a28045e0..f3412ea74858605b2d52c97a2c916ffca8d55c98:/samples/html/test/test.cpp diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp index fa61e56489..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,11 +51,12 @@ // 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); private: + wxHtmlWindow *m_Html; // any class wishing to process wxWindows events must use this macro DECLARE_EVENT_TABLE() }; @@ -68,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 }; // ---------------------------------------------------------------------------- @@ -85,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() @@ -107,13 +109,15 @@ // `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); + 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)); @@ -134,19 +138,18 @@ // main frame // ---------------------------------------------------------------------------- -wxHtmlWindow *html; // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size) + : wxFrame((wxFrame *)NULL, -1, title, pos, size, wxDEFAULT_FRAME_STYLE, "html_test_app") { // create a menu bar 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, "E&xit"); + menuFile->Append(Minimal_Quit, "&Close frame"); menuNav->Append(Minimal_Back, "Go &BACK"); menuNav->Append(Minimal_Forward, "Go &FORWARD"); @@ -160,15 +163,11 @@ wxHtmlWindow *html; CreateStatusBar(1); - { - wxConfig *cfg = new wxConfig("wxHtmlTest"); - html = new wxHtmlWindow(this); - html -> SetRelatedFrame(this, "HTML : %s"); - html -> SetRelatedStatusBar(0); - html -> ReadCustomization(cfg); - delete cfg; - html -> LoadPage("test.htm"); - } + m_Html = new wxHtmlWindow(this); + m_Html -> SetRelatedFrame(this, "HTML : %s"); + m_Html -> SetRelatedStatusBar(0); + m_Html -> ReadCustomization(wxConfig::Get()); + m_Html -> LoadPage("test.htm"); } @@ -177,27 +176,27 @@ wxHtmlWindow *html; void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { // TRUE is to force the frame to close - wxLogDebug("about to save config..."); - wxConfig *cfg = new wxConfig("wxHtmlTest"); - html -> WriteCustomization(cfg); - delete cfg; - Close(TRUE); + m_Html -> WriteCustomization(wxConfig::Get()); + delete wxConfig::Set(NULL); + Close(TRUE); } - void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) + void MyFrame::OnPageOpen(wxCommandEvent& WXUNUSED(event)) { - html -> LoadPage("fft.html"); + wxString p = wxFileSelector("Open HTML document", "", "", "", "HTML files|*.htm"); + if (p != wxEmptyString) + m_Html -> LoadPage(p); } void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event)) { - if (!html -> HistoryBack()) wxMessageBox("You reached prehistory era!"); + if (!m_Html -> HistoryBack()) wxMessageBox("You reached prehistory era!"); } void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event)) { - if (!html -> HistoryForward()) wxMessageBox("No more items in history!"); + if (!m_Html -> HistoryForward()) wxMessageBox("No more items in history!"); }