X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f11c2334567bd440bb2676f43d3376badc921f2..b3ecee8d120ac8af59cbf82b00d4c7da9f648f53:/samples/html/test/test.cpp?ds=sidebyside diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp index 18dc7cdd4e..d42117b966 100644 --- a/samples/html/test/test.cpp +++ b/samples/html/test/test.cpp @@ -30,6 +30,7 @@ #include "wx/utils.h" #include "wx/clipbrd.h" #include "wx/dataobj.h" +#include "wx/stopwatch.h" #include "../../sample.xpm" @@ -48,19 +49,33 @@ public: class MyHtmlWindow : public wxHtmlWindow { public: - MyHtmlWindow(wxWindow *parent) : wxHtmlWindow( parent ) { } + MyHtmlWindow(wxWindow *parent) : wxHtmlWindow( parent ) + { + // no custom background initially to avoid confusing people + m_drawCustomBg = false; + } virtual wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType WXUNUSED(type), const wxString& WXUNUSED(url), wxString *WXUNUSED(redirect)) const; + // toggle drawing of custom background + void DrawCustomBg(bool draw) + { + m_drawCustomBg = draw; + Refresh(); + } + private: +#if wxUSE_CLIPBOARD void OnClipboardEvent(wxClipboardTextEvent& event); +#endif // wxUSE_CLIPBOARD + void OnEraseBgEvent(wxEraseEvent& event); + + bool m_drawCustomBg; -#if wxUSE_CLIPBOARD DECLARE_EVENT_TABLE() -#endif // wxUSE_CLIPBOARD - DECLARE_NO_COPY_CLASS(MyHtmlWindow) + wxDECLARE_NO_COPY_CLASS(MyHtmlWindow); }; // Define a new frame type: this is going to be our main frame @@ -78,6 +93,7 @@ public: void OnBack(wxCommandEvent& event); void OnForward(wxCommandEvent& event); void OnProcessor(wxCommandEvent& event); + void OnDrawCustomBg(wxCommandEvent& event); void OnHtmlLinkClicked(wxHtmlLinkEvent& event); void OnHtmlCellHover(wxHtmlCellEvent &event); @@ -120,7 +136,8 @@ enum ID_DefaultWebBrowser, ID_Back, ID_Forward, - ID_Processor + ID_Processor, + ID_DrawCustomBg }; // ---------------------------------------------------------------------------- @@ -135,6 +152,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_Back, MyFrame::OnBack) EVT_MENU(ID_Forward, MyFrame::OnForward) EVT_MENU(ID_Processor, MyFrame::OnProcessor) + EVT_MENU(ID_DrawCustomBg, MyFrame::OnDrawCustomBg) EVT_HTML_LINK_CLICKED(wxID_ANY, MyFrame::OnHtmlLinkClicked) EVT_HTML_CELL_HOVER(wxID_ANY, MyFrame::OnHtmlCellHover) @@ -154,6 +172,9 @@ IMPLEMENT_APP(MyApp) // `Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + #if wxUSE_SYSTEM_OPTIONS wxSystemOptions::SetOption(wxT("no-maskblt"), 1); #endif @@ -189,13 +210,14 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) wxMenu *menuFile = new wxMenu; wxMenu *menuNav = new wxMenu; - menuFile->Append(ID_PageOpen, _("&Open HTML page...")); + menuFile->Append(ID_PageOpen, _("&Open HTML page...\tCtrl-O")); menuFile->Append(ID_DefaultLocalBrowser, _("&Open current page with default browser")); menuFile->Append(ID_DefaultWebBrowser, _("Open a &web page with default browser")); menuFile->AppendSeparator(); menuFile->Append(ID_Processor, _("&Remove bold attribute"), wxEmptyString, wxITEM_CHECK); - + menuFile->AppendSeparator(); + menuFile->AppendCheckItem(ID_DrawCustomBg, "&Draw custom background"); menuFile->AppendSeparator(); menuFile->Append(wxID_EXIT, _("&Close frame")); menuNav->Append(ID_Back, _("Go &BACK")); @@ -230,13 +252,13 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) m_Html = new MyHtmlWindow(this); m_Html->SetRelatedFrame(this, _("HTML : %s")); #if wxUSE_STATUSBAR - m_Html->SetRelatedStatusBar(0); + m_Html->SetRelatedStatusBar(1); #endif // wxUSE_STATUSBAR m_Html->ReadCustomization(wxConfig::Get()); m_Html->LoadFile(wxFileName(wxT("test.htm"))); m_Html->AddProcessor(m_Processor); - wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, _T(""), + wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE); @@ -267,7 +289,15 @@ void MyFrame::OnPageOpen(wxCommandEvent& WXUNUSED(event)) wxEmptyString, wxEmptyString, wxT("HTML files|*.htm;*.html")); if (!p.empty()) + { +#if wxUSE_STOPWATCH + wxStopWatch sw; +#endif m_Html->LoadFile(wxFileName(p)); +#if wxUSE_STOPWATCH + wxLogStatus("Loaded \"%s\" in %lums", p, sw.Time()); +#endif + } #endif // wxUSE_FILEDLG } @@ -311,6 +341,11 @@ void MyFrame::OnProcessor(wxCommandEvent& WXUNUSED(event)) m_Html->LoadPage(m_Html->GetOpenedPage()); } +void MyFrame::OnDrawCustomBg(wxCommandEvent& event) +{ + m_Html->DrawCustomBg(event.IsChecked()); +} + void MyFrame::OnHtmlLinkClicked(wxHtmlLinkEvent &event) { wxLogMessage(wxT("The url '%s' has been clicked!"), event.GetLinkInfo().GetHref().c_str()); @@ -322,13 +357,13 @@ void MyFrame::OnHtmlLinkClicked(wxHtmlLinkEvent &event) void MyFrame::OnHtmlCellHover(wxHtmlCellEvent &event) { - wxLogMessage(wxT("Mouse moved over cell %d at %d;%d"), + wxLogMessage(wxT("Mouse moved over cell %p at %d;%d"), event.GetCell(), event.GetPoint().x, event.GetPoint().y); } void MyFrame::OnHtmlCellClicked(wxHtmlCellEvent &event) { - wxLogMessage(wxT("Click over cell %d at %d;%d"), + wxLogMessage(wxT("Click over cell %p at %d;%d"), event.GetCell(), event.GetPoint().x, event.GetPoint().y); // if we don't skip the event, OnHtmlLinkClicked won't be called! @@ -339,15 +374,18 @@ wxHtmlOpeningStatus MyHtmlWindow::OnOpeningURL(wxHtmlURLType WXUNUSED(type), const wxString& url, wxString *WXUNUSED(redirect)) const { - GetRelatedFrame()->SetStatusText(url + _T(" lately opened"),1); + GetRelatedFrame()->SetStatusText(url + wxT(" lately opened"),1); return wxHTML_OPEN; } -#if wxUSE_CLIPBOARD BEGIN_EVENT_TABLE(MyHtmlWindow, wxHtmlWindow) +#if wxUSE_CLIPBOARD EVT_TEXT_COPY(wxID_ANY, MyHtmlWindow::OnClipboardEvent) +#endif // wxUSE_CLIPBOARD + EVT_ERASE_BACKGROUND(MyHtmlWindow::OnEraseBgEvent) END_EVENT_TABLE() +#if wxUSE_CLIPBOARD void MyHtmlWindow::OnClipboardEvent(wxClipboardTextEvent& WXUNUSED(event)) { // explicitly call wxHtmlWindow::CopySelection() method @@ -355,19 +393,48 @@ void MyHtmlWindow::OnClipboardEvent(wxClipboardTextEvent& WXUNUSED(event)) if ( CopySelection() ) { wxTextDataObject data; - if ( wxTheClipboard && wxTheClipboard->GetData(data) ) + if ( wxTheClipboard && wxTheClipboard->Open() && wxTheClipboard->GetData(data) ) { const wxString text = data.GetText(); const size_t maxTextLength = 100; - wxLogStatus(wxString::Format(_T("Clipboard: '%s%s'"), + wxLogStatus(wxString::Format(wxT("Clipboard: '%s%s'"), wxString(text, maxTextLength).c_str(), - (text.length() > maxTextLength) ? _T("...") - : _T(""))); + (text.length() > maxTextLength) ? wxT("...") + : wxT(""))); + wxTheClipboard->Close(); + return; } } - wxLogStatus(_T("Clipboard: nothing")); + wxLogStatus(wxT("Clipboard: nothing")); } #endif // wxUSE_CLIPBOARD + +void MyHtmlWindow::OnEraseBgEvent(wxEraseEvent& event) +{ + if ( !m_drawCustomBg ) + { + event.Skip(); + return; + } + + // draw a background grid to show that this handler is indeed executed + + wxDC& dc = *event.GetDC(); + dc.SetPen(*wxBLUE_PEN); + dc.Clear(); + + const wxSize size = GetVirtualSize(); + for ( int x = 0; x < size.x; x += 15 ) + { + dc.DrawLine(x, 0, x, size.y); + } + + for ( int y = 0; y < size.y; y += 15 ) + { + dc.DrawLine(0, y, size.x, y); + } +} +