Add virtual destructors to fix GCC4 warnings.

[wxWidgets.git] / src / msw / webview_ie.cpp

diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index 868877c9ef330a6d664702b16ebc3ccbf0bed6b5..92edb4ecd5e8a1d86f7faa0c35036bad56cc1344 100644 (file)
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -75,12 +75,12 @@ bool wxWebViewIE::Create(wxWindow* parent,
 
     SetBackgroundStyle(wxBG_STYLE_PAINT);
     SetDoubleBuffered(true);
 
     SetBackgroundStyle(wxBG_STYLE_PAINT);
     SetDoubleBuffered(true);

-    LoadUrl(url);
+    LoadURL(url);

     return true;
 }
 
 
     return true;
 }
 
 

-void wxWebViewIE::LoadUrl(const wxString& url)
+void wxWebViewIE::LoadURL(const wxString& url)

 {
     m_ie.CallMethod("Navigate", (BSTR) url.wc_str(), NULL, NULL, NULL, NULL);
 }
 {
     m_ie.CallMethod("Navigate", (BSTR) url.wc_str(), NULL, NULL, NULL, NULL);
 }


@@ -109,8 +109,8 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
 
         //We send the events when we are done to mimic webkit
         //Navigated event
 
         //We send the events when we are done to mimic webkit
         //Navigated event

-        wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
-                                   GetId(), baseUrl, "", false);
+        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+                             GetId(), baseUrl, "");

         event.SetEventObject(this);
         HandleWindowEvent(event);
 
         event.SetEventObject(this);
         HandleWindowEvent(event);
 


@@ -126,7 +126,7 @@ void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
 
 }
 
 
 }
 

-wxString wxWebViewIE::GetPageSource()
+wxString wxWebViewIE::GetPageSource() const

 {
     IHTMLDocument2* document = GetDocument();
     IHTMLElement *bodyTag = NULL;
 {
     IHTMLDocument2* document = GetDocument();
     IHTMLElement *bodyTag = NULL;


@@ -150,7 +150,7 @@ wxString wxWebViewIE::GetPageSource()
     return source;
 }
 
     return source;
 }
 

-wxWebViewZoom wxWebViewIE::GetZoom()
+wxWebViewZoom wxWebViewIE::GetZoom() const

 {
     if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
         return GetIEOpticalZoom();
 {
     if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
         return GetIEOpticalZoom();


@@ -190,7 +190,7 @@ void wxWebViewIE::SetIETextZoom(wxWebViewZoom level)
     wxASSERT(result == S_OK);
 }
 
     wxASSERT(result == S_OK);
 }
 

-wxWebViewZoom wxWebViewIE::GetIETextZoom()
+wxWebViewZoom wxWebViewIE::GetIETextZoom() const

 {
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
 {
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);


@@ -242,7 +242,7 @@ void wxWebViewIE::SetIEOpticalZoom(wxWebViewZoom level)
     wxASSERT(result == S_OK);
 }
 
     wxASSERT(result == S_OK);
 }
 

-wxWebViewZoom wxWebViewIE::GetIEOpticalZoom()
+wxWebViewZoom wxWebViewIE::GetIEOpticalZoom() const

 {
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);
 {
     VARIANT zoomVariant;
     VariantInit (&zoomVariant);


@@ -309,7 +309,7 @@ void wxWebViewIE::Print()
                          OLECMDEXECOPT_DODEFAULT, NULL, NULL);
 }
 
                          OLECMDEXECOPT_DODEFAULT, NULL, NULL);
 }
 

-bool wxWebViewIE::CanGoBack()
+bool wxWebViewIE::CanGoBack() const

 {
     if(m_historyEnabled)
         return m_historyPosition > 0;
 {
     if(m_historyEnabled)
         return m_historyPosition > 0;


@@ -317,7 +317,7 @@ bool wxWebViewIE::CanGoBack()
         return false;
 }
 
         return false;
 }
 

-bool wxWebViewIE::CanGoForward()
+bool wxWebViewIE::CanGoForward() const

 {
     if(m_historyEnabled)
         return m_historyPosition != static_cast<int>(m_historyList.size()) - 1;
 {
     if(m_historyEnabled)
         return m_historyPosition != static_cast<int>(m_historyList.size()) - 1;


@@ -325,7 +325,7 @@ bool wxWebViewIE::CanGoForward()
         return false;
 }
 
         return false;
 }
 

-void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
+void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)

 {
     int pos = -1;
     for(unsigned int i = 0; i < m_historyList.size(); i++)
 {
     int pos = -1;
     for(unsigned int i = 0; i < m_historyList.size(); i++)


@@ -337,13 +337,13 @@ void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
     wxASSERT_MSG(pos != static_cast<int>(m_historyList.size()),
                  "invalid history item");
     m_historyLoadingFromList = true;
     wxASSERT_MSG(pos != static_cast<int>(m_historyList.size()),
                  "invalid history item");
     m_historyLoadingFromList = true;

-    LoadUrl(item->GetUrl());
+    LoadURL(item->GetUrl());

     m_historyPosition = pos;
 }
 
     m_historyPosition = pos;
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetBackwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewIE::GetBackwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > backhist;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;

     //As we don't have std::copy or an iterator constructor in the wxwidgets
     //native vector we construct it by hand
     for(int i = 0; i < m_historyPosition; i++)
     //As we don't have std::copy or an iterator constructor in the wxwidgets
     //native vector we construct it by hand
     for(int i = 0; i < m_historyPosition; i++)


@@ -353,9 +353,9 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetBackwardHistory()
     return backhist;
 }
 
     return backhist;
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetForwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewIE::GetForwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > forwardhist;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > 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 < static_cast<int>(m_historyList.size()); i++)
     //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 < static_cast<int>(m_historyList.size()); i++)


@@ -433,8 +433,8 @@ void wxWebViewIE::SetOfflineMode(bool offline)
     wxASSERT(success);
 }
 
     wxASSERT(success);
 }
 

-bool wxWebViewIE::IsBusy()
-{
+bool wxWebViewIE::IsBusy() const
+{ 

     if (m_isBusy) return true;
 
     wxVariant out = m_ie.GetProperty("Busy");
     if (m_isBusy) return true;
 
     wxVariant out = m_ie.GetProperty("Busy");


@@ -444,7 +444,7 @@ bool wxWebViewIE::IsBusy()
     return out.GetBool();
 }
 
     return out.GetBool();
 }
 

-wxString wxWebViewIE::GetCurrentURL()
+wxString wxWebViewIE::GetCurrentURL() const

 {
     wxVariant out = m_ie.GetProperty("LocationURL");
 
 {
     wxVariant out = m_ie.GetProperty("LocationURL");
 


@@ -452,7 +452,7 @@ wxString wxWebViewIE::GetCurrentURL()
     return out.GetString();
 }
 
     return out.GetString();
 }
 

-wxString wxWebViewIE::GetCurrentTitle()
+wxString wxWebViewIE::GetCurrentTitle() const

 {
     IHTMLDocument2* document = GetDocument();
     BSTR title;
 {
     IHTMLDocument2* document = GetDocument();
     BSTR title;


@@ -462,16 +462,16 @@ wxString wxWebViewIE::GetCurrentTitle()
     return wxString(title);
 }
 
     return wxString(title);
 }
 

-bool wxWebViewIE::CanCut()
+bool wxWebViewIE::CanCut() const

 {
     return CanExecCommand("Cut");
 }
 
 {
     return CanExecCommand("Cut");
 }
 

-bool wxWebViewIE::CanCopy()
+bool wxWebViewIE::CanCopy() const

 {
     return CanExecCommand("Copy");
 }
 {
     return CanExecCommand("Copy");
 }

-bool wxWebViewIE::CanPaste()
+bool wxWebViewIE::CanPaste() const

 {
     return CanExecCommand("Paste");
 }
 {
     return CanExecCommand("Paste");
 }


@@ -491,11 +491,11 @@ void wxWebViewIE::Paste()
     ExecCommand("Paste");
 }
 
     ExecCommand("Paste");
 }
 

-bool wxWebViewIE::CanUndo()
+bool wxWebViewIE::CanUndo() const

 {
     return CanExecCommand("Undo");
 }
 {
     return CanExecCommand("Undo");
 }

-bool wxWebViewIE::CanRedo()
+bool wxWebViewIE::CanRedo() const

 {
     return CanExecCommand("Redo");
 }
 {
     return CanExecCommand("Redo");
 }


@@ -521,7 +521,7 @@ void wxWebViewIE::SetEditable(bool enable)
     document->Release();
 }
 
     document->Release();
 }
 

-bool wxWebViewIE::IsEditable()
+bool wxWebViewIE::IsEditable() const

 {
     IHTMLDocument2* document = GetDocument();
     BSTR mode;
 {
     IHTMLDocument2* document = GetDocument();
     BSTR mode;


@@ -538,7 +538,7 @@ void wxWebViewIE::SelectAll()
     ExecCommand("SelectAll");
 }
 
     ExecCommand("SelectAll");
 }
 

-bool wxWebViewIE::HasSelection()
+bool wxWebViewIE::HasSelection() const

 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;
 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;


@@ -560,7 +560,7 @@ void wxWebViewIE::DeleteSelection()
     ExecCommand("Delete");
 }
 
     ExecCommand("Delete");
 }
 

-wxString wxWebViewIE::GetSelectedText()
+wxString wxWebViewIE::GetSelectedText() const

 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;
 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;


@@ -589,7 +589,7 @@ wxString wxWebViewIE::GetSelectedText()
     return selected;
 }
 
     return selected;
 }
 

-wxString wxWebViewIE::GetSelectedSource()
+wxString wxWebViewIE::GetSelectedSource() const

 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;
 {
     IHTMLDocument2* document = GetDocument();
     IHTMLSelectionObject* selection;


@@ -632,7 +632,7 @@ void wxWebViewIE::ClearSelection()
     document->Release();
 }
 
     document->Release();
 }
 

-wxString wxWebViewIE::GetPageText()
+wxString wxWebViewIE::GetPageText() const

 {
     IHTMLDocument2* document = GetDocument();
     wxString text;
 {
     IHTMLDocument2* document = GetDocument();
     wxString text;


@@ -665,7 +665,7 @@ void wxWebViewIE::RunScript(const wxString& javascript)
     document->Release();
 }
 
     document->Release();
 }
 

-void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebHandler> handler)
+void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)

 {
     ClassFactory* cf = new ClassFactory(handler);
     IInternetSession* session;
 {
     ClassFactory* cf = new ClassFactory(handler);
     IInternetSession* session;


@@ -681,7 +681,7 @@ void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebHandler> handler)
     }
 }
 
     }
 }
 

-bool wxWebViewIE::CanExecCommand(wxString command)
+bool wxWebViewIE::CanExecCommand(wxString command) const

 {
     IHTMLDocument2* document = GetDocument();
     VARIANT_BOOL enabled;
 {
     IHTMLDocument2* document = GetDocument();
     VARIANT_BOOL enabled;


@@ -699,7 +699,7 @@ void wxWebViewIE::ExecCommand(wxString command)
     document->Release();
 }
 
     document->Release();
 }
 

-IHTMLDocument2* wxWebViewIE::GetDocument()
+IHTMLDocument2* wxWebViewIE::GetDocument() const

 {
     wxVariant variant = m_ie.GetProperty("Document");
     IHTMLDocument2* document = (IHTMLDocument2*)variant.GetVoidPtr();
 {
     wxVariant variant = m_ie.GetProperty("Document");
     IHTMLDocument2* document = (IHTMLDocument2*)variant.GetVoidPtr();


@@ -722,12 +722,12 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
             wxString url = evt[1].GetString();
             wxString target = evt[3].GetString();
 
             wxString url = evt[1].GetString();
             wxString target = evt[3].GetString();
 

-            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
-                                       GetId(), url, target, true);
+            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+                                 GetId(), url, target);

             event.SetEventObject(this);
             HandleWindowEvent(event);
 
             event.SetEventObject(this);
             HandleWindowEvent(event);
 

-            if (event.IsVetoed())
+            if (!event.IsAllowed())

             {
                 wxActiveXEventNativeMSW* nativeParams =
                     evt.GetNativeParameters();
             {
                 wxActiveXEventNativeMSW* nativeParams =
                     evt.GetNativeParameters();


@@ -748,8 +748,8 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
             wxString url = evt[1].GetString();
             // TODO: set target parameter if possible
             wxString target = wxEmptyString;
             wxString url = evt[1].GetString();
             // TODO: set target parameter if possible
             wxString target = wxEmptyString;

-            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
-                                       GetId(), url, target, false);
+            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+                                 GetId(), url, target);

             event.SetEventObject(this);
             HandleWindowEvent(event);
             break;
             event.SetEventObject(this);
             HandleWindowEvent(event);
             break;


@@ -774,7 +774,13 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
 
             //As we are complete we also add to the history list, but not if the
             //page is not the main page, ie it is a subframe
 
             //As we are complete we also add to the history list, but not if the
             //page is not the main page, ie it is a subframe

-            if(m_historyEnabled && !m_historyLoadingFromList && url == GetCurrentURL())
+            //We also have to check if we are loading a file:// url, if so we 
+            //need to change the comparison as ie passes back a different style
+            //of url
+            if(m_historyEnabled && !m_historyLoadingFromList && 
+              (url == GetCurrentURL() || 
+              (GetCurrentURL().substr(0, 4) == "file" && 
+               wxFileSystem::URLToFileName(GetCurrentURL()).GetFullPath() == url)))

             {
                 //If we are not at the end of the list, then erase everything
                 //between us and the end before adding the new page
             {
                 //If we are not at the end of the list, then erase everything
                 //between us and the end before adding the new page


@@ -783,7 +789,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
                     m_historyList.erase(m_historyList.begin() + m_historyPosition + 1,
                                         m_historyList.end());
                 }
                     m_historyList.erase(m_historyList.begin() + m_historyPosition + 1,
                                         m_historyList.end());
                 }

-                wxSharedPtr<wxWebHistoryItem> item(new wxWebHistoryItem(url, GetCurrentTitle()));
+                wxSharedPtr<wxWebViewHistoryItem> item(new wxWebViewHistoryItem(url, GetCurrentTitle()));

                 m_historyList.push_back(item);
                 m_historyPosition++;
             }
                 m_historyList.push_back(item);
                 m_historyPosition++;
             }


@@ -791,8 +797,8 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
             m_historyLoadingFromList = false;
             // TODO: set target parameter if possible
             wxString target = wxEmptyString;
             m_historyLoadingFromList = false;
             // TODO: set target parameter if possible
             wxString target = wxEmptyString;

-            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(),
-                                       url, target, false);
+            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(),
+                                 url, target);

             event.SetEventObject(this);
             HandleWindowEvent(event);
             break;
             event.SetEventObject(this);
             HandleWindowEvent(event);
             break;


@@ -807,8 +813,8 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
         {
             wxString title = evt[0].GetString();
 
         {
             wxString title = evt[0].GetString();
 

-            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
-                                       GetId(), GetCurrentURL(), wxEmptyString, true);
+            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+                                 GetId(), GetCurrentURL(), "");

             event.SetString(title);
             event.SetEventObject(this);
             HandleWindowEvent(event);
             event.SetString(title);
             event.SetEventObject(this);
             HandleWindowEvent(event);


@@ -817,7 +823,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
 
         case DISPID_NAVIGATEERROR:
         {
 
         case DISPID_NAVIGATEERROR:
         {

-            wxWebNavigationError errorType = wxWEB_NAV_ERR_OTHER;
+            wxWebViewNavigationError errorType = wxWEB_NAV_ERR_OTHER;

             wxString errorCode = "?";
             switch (evt[3].GetLong())
             {
             wxString errorCode = "?";
             switch (evt[3].GetLong())
             {


@@ -931,8 +937,8 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
 
             wxString url = evt[1].GetString();
             wxString target = evt[2].GetString();
 
             wxString url = evt[1].GetString();
             wxString target = evt[2].GetString();

-            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(),
-                                       url, target, false);
+            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR, GetId(),
+                                 url, target);

             event.SetEventObject(this);
             event.SetInt(errorType);
             event.SetString(errorCode);
             event.SetEventObject(this);
             event.SetInt(errorType);
             event.SetString(errorCode);


@@ -943,8 +949,8 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
         {
             wxString url = evt[4].GetString();
 
         {
             wxString url = evt[4].GetString();
 

-            wxWebNavigationEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
-                                       GetId(), url, wxEmptyString, true);
+            wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
+                                 GetId(), url, wxEmptyString);

             event.SetEventObject(this);
             HandleWindowEvent(event);
 
             event.SetEventObject(this);
             HandleWindowEvent(event);
 


@@ -959,7 +965,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
     evt.Skip();
 }
 
     evt.Skip();
 }
 

-VirtualProtocol::VirtualProtocol(wxSharedPtr<wxWebHandler> handler)
+VirtualProtocol::VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler)

 {
     m_refCount = 0;
     m_file = NULL;
 {
     m_refCount = 0;
     m_file = NULL;