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

no real changes, just simplify LoadPage() to make it more readable and less redundant

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-05-31 13:25:50 +00:00
parent 3656eefc89
commit e4e487e2a5
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/html/htmlwin.cpp
View File

@@ -472,7 +472,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
wxBusyCursor busyCursor; wxBusyCursor busyCursor;
wxFSFile *f;
bool rt_val; bool rt_val;
bool needs_refresh = false; bool needs_refresh = false;
@@ -485,31 +484,28 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
(*m_History)[m_HistoryPos].SetPos(y); (*m_History)[m_HistoryPos].SetPos(y);
} }
if (location[0] == wxT('#')) // first check if we're moving to an anchor in the same page
size_t posLocalAnchor = location.Find('#');
if ( posLocalAnchor != wxString::npos && posLocalAnchor != 0 )
{ {
// local anchor: // check if the part before the anchor is the same as the (either
wxString anch = location.Mid(1) /*1 to end*/; // relative or absolute) URI of the current page
m_tmpCanDrawLocks--; const wxString beforeAnchor = location.substr(0, posLocalAnchor);
rt_val = ScrollToAnchor(anch); if ( beforeAnchor != m_OpenedPage &&
m_tmpCanDrawLocks++; m_FS->GetPath() + beforeAnchor != m_OpenedPage )
{
// indicate that we're not moving to a local anchor
posLocalAnchor = wxString::npos;
} }
else if (location.Find(wxT('#')) != wxNOT_FOUND && location.BeforeFirst(wxT('#')) == m_OpenedPage)
{
wxString anch = location.AfterFirst(wxT('#'));
m_tmpCanDrawLocks--;
rt_val = ScrollToAnchor(anch);
m_tmpCanDrawLocks++;
}
else if (location.Find(wxT('#')) != wxNOT_FOUND &&
(m_FS->GetPath() + location.BeforeFirst(wxT('#'))) == m_OpenedPage)
{
wxString anch = location.AfterFirst(wxT('#'));
m_tmpCanDrawLocks--;
rt_val = ScrollToAnchor(anch);
m_tmpCanDrawLocks++;
} }
else if ( posLocalAnchor != wxString::npos )
{
m_tmpCanDrawLocks--;
rt_val = ScrollToAnchor(location.substr(posLocalAnchor + 1));
m_tmpCanDrawLocks++;
}
else // moving to another page
{ {
needs_refresh = true; needs_refresh = true;
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
@@ -521,7 +517,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
} }
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
f = m_Parser->OpenURL(wxHTML_URL_PAGE, location); wxFSFile *f = m_Parser->OpenURL(wxHTML_URL_PAGE, location);
// try to interpret 'location' as filename instead of URL: // try to interpret 'location' as filename instead of URL:
if (f == NULL) if (f == NULL)