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

Fix warnings in the ie backend.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-07-11 09:35:41 +00:00
parent c9355a3df6
commit 22ca10faec
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/webview_ie.h
View File

@@ -21,7 +21,7 @@
#include "wx/sharedptr.h"
#include "wx/vector.h"
class IHTMLDocument2;
struct IHTMLDocument2;
class WXDLLIMPEXP_WEB wxWebViewIE : public wxWebView
{
@@ -125,7 +125,7 @@ public:
float GetIEOpticalZoom();
void onActiveXEvent(wxActiveXEvent& evt);
void onEraseBg(wxEraseEvent& evt) {}
void onEraseBg(wxEraseEvent&) {}
DECLARE_EVENT_TABLE();

11
src/msw/webview_ie.cpp
View File

@@ -129,7 +129,7 @@ void wxWebViewIE::LoadUrl(const wxString& url)
//(HRESULT)(out.GetLong()) == S_OK;
}
void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
void wxWebViewIE::SetPage(const wxString& html, const wxString&)
{
LoadUrl("about:blank");
@@ -353,7 +353,7 @@ bool wxWebViewIE::CanGoBack()
bool wxWebViewIE::CanGoForward()
{
if(m_historyEnabled)
return m_historyPosition != m_historyList.size() - 1;
return m_historyPosition != static_cast<int>(m_historyList.size()) - 1;
else
return false;
}
@@ -367,7 +367,8 @@ void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
if(m_historyList[i].get() == item.get())
pos = i;
}
wxASSERT_MSG(pos != m_historyList.size(), "invalid history item");
wxASSERT_MSG(pos != static_cast<int>(m_historyList.size()),
"invalid history item");
m_historyLoadingFromList = true;
LoadUrl(item->GetUrl());
m_historyPosition = pos;
@@ -390,7 +391,7 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetForwardHistory()
wxVector<wxSharedPtr<wxWebHistoryItem> > forwardhist;
//As we don't have std::copy or an iterator constructor in the wxwidgets
//native vector we construct it by hand
for(int i = m_historyPosition + 1; i < m_historyList.size(); i++)
for(int i = m_historyPosition + 1; i < static_cast<int>(m_historyList.size()); i++)
{
forwardhist.push_back(m_historyList[i]);
}
@@ -708,7 +709,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
{
//If we are not at the end of the list, then erase everything
//between us and the end before adding the new page
if(m_historyPosition != m_historyList.size() - 1)
if(m_historyPosition != static_cast<int>(m_historyList.size()) - 1)
{
m_historyList.erase(m_historyList.begin() + m_historyPosition + 1,
m_historyList.end());