From 22ca10faec948fc37b31013f1b7469f0325d1c16 Mon Sep 17 00:00:00 2001 From: Steve Lamerton Date: Mon, 11 Jul 2011 09:35:41 +0000 Subject: [PATCH] Fix warnings in the ie backend. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/webview_ie.h | 4 ++-- src/msw/webview_ie.cpp | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h index 75f2a583dd..8255f5bc09 100644 --- a/include/wx/msw/webview_ie.h +++ b/include/wx/msw/webview_ie.h @@ -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(); diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index 0735858ff6..501a28c6c5 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -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(m_historyList.size()) - 1; else return false; } @@ -367,7 +367,8 @@ void wxWebViewIE::LoadHistoryItem(wxSharedPtr item) if(m_historyList[i].get() == item.get()) pos = i; } - wxASSERT_MSG(pos != m_historyList.size(), "invalid history item"); + wxASSERT_MSG(pos != static_cast(m_historyList.size()), + "invalid history item"); m_historyLoadingFromList = true; LoadUrl(item->GetUrl()); m_historyPosition = pos; @@ -390,7 +391,7 @@ wxVector > wxWebViewIE::GetForwardHistory() wxVector > 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(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(m_historyList.size()) - 1) { m_historyList.erase(m_historyList.begin() + m_historyPosition + 1, m_historyList.end()); -- 2.45.2