Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxHtmlWindow now grabs the focus when clicked on. (Didn't all windows

Browse Source 
do this automatically in the past?)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-09-07 19:25:34 +00:00
parent 9cedab372e
commit 790dbce337
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/html/htmlwin.cpp
View File

@@ -94,11 +94,11 @@ void wxHtmlWindow::Init()
SetBorders(10); SetBorders(10);
} }
bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id, bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, 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)) style | wxVSCROLL | wxHSCROLL, name))
return FALSE; return FALSE;
@@ -215,7 +215,7 @@ bool wxHtmlWindow::AppendToPage(const wxString& source)
bool wxHtmlWindow::LoadPage(const wxString& location) bool wxHtmlWindow::LoadPage(const wxString& location)
{ {
wxBusyCursor busyCursor; wxBusyCursor busyCursor;
wxFSFile *f; wxFSFile *f;
bool rt_val; bool rt_val;
bool needs_refresh = FALSE; bool needs_refresh = FALSE;
@@ -262,7 +262,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar); m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
Refresh(FALSE); Refresh(FALSE);
} }
f = m_Parser->OpenURL(wxHTML_URL_PAGE, location); f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);
if (f == NULL) if (f == NULL)
@@ -643,8 +643,8 @@ void wxHtmlWindow::OnDraw(wxDC& dc)
dc.SetBackgroundMode(wxTRANSPARENT); dc.SetBackgroundMode(wxTRANSPARENT);
GetViewStart(&x, &y); GetViewStart(&x, &y);
m_Cell->Draw(dc, 0, 0, m_Cell->Draw(dc, 0, 0,
y * wxHTML_SCROLL_STEP + rect.GetTop(), y * wxHTML_SCROLL_STEP + rect.GetTop(),
y * wxHTML_SCROLL_STEP + rect.GetBottom()); y * wxHTML_SCROLL_STEP + rect.GetBottom());
} }
@@ -665,6 +665,7 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
if (event.ButtonDown()) if (event.ButtonDown())
{ {
SetFocus();
if ( m_Cell ) if ( m_Cell )
{ {
int sx, sy; int sx, sy;