From: Robin Dunn Date: Sat, 7 Sep 2002 19:25:34 +0000 (+0000) Subject: wxHtmlWindow now grabs the focus when clicked on. (Didn't all windows X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/790dbce337d394141b238943cd779e02770fc014 wxHtmlWindow now grabs the focus when clicked on. (Didn't all windows do this automatically in the past?) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index 835b1d48ba..ebb83bd452 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -94,11 +94,11 @@ void wxHtmlWindow::Init() SetBorders(10); } -bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, +bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, const wxString& name) + long style, const wxString& name) { - if (!wxScrolledWindow::Create(parent, id, pos, size, + if (!wxScrolledWindow::Create(parent, id, pos, size, style | wxVSCROLL | wxHSCROLL, name)) return FALSE; @@ -215,7 +215,7 @@ bool wxHtmlWindow::AppendToPage(const wxString& source) bool wxHtmlWindow::LoadPage(const wxString& location) { wxBusyCursor busyCursor; - + wxFSFile *f; bool rt_val; bool needs_refresh = FALSE; @@ -262,7 +262,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar); Refresh(FALSE); } - + f = m_Parser->OpenURL(wxHTML_URL_PAGE, location); if (f == NULL) @@ -643,8 +643,8 @@ void wxHtmlWindow::OnDraw(wxDC& dc) dc.SetBackgroundMode(wxTRANSPARENT); GetViewStart(&x, &y); - m_Cell->Draw(dc, 0, 0, - y * wxHTML_SCROLL_STEP + rect.GetTop(), + m_Cell->Draw(dc, 0, 0, + y * wxHTML_SCROLL_STEP + rect.GetTop(), y * wxHTML_SCROLL_STEP + rect.GetBottom()); } @@ -665,6 +665,7 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event) if (event.ButtonDown()) { + SetFocus(); if ( m_Cell ) { int sx, sy;