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

Add handling of http errors to wxWebViewIE. Tidy up existing large case statement.

Browse Source 
Closes #14877.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2012-12-30 20:19:58 +00:00
parent 04a6ed3efd
commit c13815810e
2 changed files with 82 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
samples/webview/webview.cpp
View File

@@ -965,48 +965,30 @@ void WebFrame::OnSelectAll(wxCommandEvent& WXUNUSED(evt))
* Callback invoked when a loading error occurs
*/
void WebFrame::OnError(wxWebViewEvent& evt)
{
wxString errorCategory;
{
#define WX_ERROR_CASE(type) \
case type: \
category = #type; \
break;
wxString category;
switch (evt.GetInt())
{
case wxWEB_NAV_ERR_CONNECTION:
errorCategory = "wxWEB_NAV_ERR_CONNECTION";
break;
case wxWEB_NAV_ERR_CERTIFICATE:
errorCategory = "wxWEB_NAV_ERR_CERTIFICATE";
break;
case wxWEB_NAV_ERR_AUTH:
errorCategory = "wxWEB_NAV_ERR_AUTH";
break;
case wxWEB_NAV_ERR_SECURITY:
errorCategory = "wxWEB_NAV_ERR_SECURITY";
break;
case wxWEB_NAV_ERR_NOT_FOUND:
errorCategory = "wxWEB_NAV_ERR_NOT_FOUND";
break;
case wxWEB_NAV_ERR_REQUEST:
errorCategory = "wxWEB_NAV_ERR_REQUEST";
break;
case wxWEB_NAV_ERR_USER_CANCELLED:
errorCategory = "wxWEB_NAV_ERR_USER_CANCELLED";
break;
case wxWEB_NAV_ERR_OTHER:
errorCategory = "wxWEB_NAV_ERR_OTHER";
break;
WX_ERROR_CASE(wxWEB_NAV_ERR_CONNECTION);
WX_ERROR_CASE(wxWEB_NAV_ERR_CERTIFICATE);
WX_ERROR_CASE(wxWEB_NAV_ERR_AUTH);
WX_ERROR_CASE(wxWEB_NAV_ERR_SECURITY);
WX_ERROR_CASE(wxWEB_NAV_ERR_NOT_FOUND);
WX_ERROR_CASE(wxWEB_NAV_ERR_REQUEST);
WX_ERROR_CASE(wxWEB_NAV_ERR_USER_CANCELLED);
WX_ERROR_CASE(wxWEB_NAV_ERR_OTHER);
}
wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + errorCategory + "' (" + evt.GetString() + ")");
wxLogMessage("%s", "Error; url='" + evt.GetURL() + "', error='" + category + " (" + evt.GetString() + ")'");
//Show the info bar with an error
m_info->ShowMessage(_("An error occurred loading ") + evt.GetURL() + "\n" +
"'" + errorCategory + "' (" + evt.GetString() + ")", wxICON_ERROR);
"'" + category + "'", wxICON_ERROR);
UpdateState();
}