Avoid an assert when m_dir is empty

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

diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index 0a6a6402326a31fff3eb94608b88ac21a48eae9c..2c7dd948d7a72489c06c272a2b8327881ac750fa 100644 (file)
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -77,6 +77,13 @@ bool wxWebViewIE::Create(wxWindow* parent,
     return true;
 }
 
     return true;
 }
 

+wxWebViewIE::~wxWebViewIE()
+{
+    for(unsigned int i = 0; i < m_factories.size(); i++)
+    {
+        m_factories[i]->Release();
+    }
+}

 
 void wxWebViewIE::LoadURL(const wxString& url)
 {
 
 void wxWebViewIE::LoadURL(const wxString& url)
 {


@@ -150,12 +157,15 @@ wxString wxWebViewIE::GetPageSource() const
 
 wxWebViewZoom wxWebViewIE::GetZoom() const
 {
 
 wxWebViewZoom wxWebViewIE::GetZoom() const
 {

-    if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
-        return GetIEOpticalZoom();
-    else if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT)
-        return GetIETextZoom();
-    else
-        wxFAIL;
+    switch( m_zoomType )
+    {
+        case wxWEB_VIEW_ZOOM_TYPE_LAYOUT:
+            return GetIEOpticalZoom();
+        case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+            return GetIETextZoom();
+        default:
+            wxFAIL;
+    }

 
     //Dummy return to stop compiler warnings
     return wxWEB_VIEW_ZOOM_MEDIUM;
 
     //Dummy return to stop compiler warnings
     return wxWEB_VIEW_ZOOM_MEDIUM;


@@ -164,12 +174,17 @@ wxWebViewZoom wxWebViewIE::GetZoom() const
 
 void wxWebViewIE::SetZoom(wxWebViewZoom zoom)
 {
 
 void wxWebViewIE::SetZoom(wxWebViewZoom zoom)
 {

-    if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_LAYOUT)
-        SetIEOpticalZoom(zoom);
-    else if(m_zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT)
-        SetIETextZoom(zoom);
-    else
-        wxFAIL;
+    switch( m_zoomType )
+    {
+        case wxWEB_VIEW_ZOOM_TYPE_LAYOUT:
+            SetIEOpticalZoom(zoom);
+            break;
+        case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+            SetIETextZoom(zoom);
+            break;
+        default:
+            wxFAIL;
+    }

 }
 
 void wxWebViewIE::SetIETextZoom(wxWebViewZoom level)
 }
 
 void wxWebViewIE::SetIETextZoom(wxWebViewZoom level)


@@ -182,9 +197,12 @@ void wxWebViewIE::SetIETextZoom(wxWebViewZoom level)
     V_VT(&zoomVariant) = VT_I4;
     V_I4(&zoomVariant) = level;
 
     V_VT(&zoomVariant) = VT_I4;
     V_I4(&zoomVariant) = level;
 

-    HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
-                                          OLECMDEXECOPT_DONTPROMPTUSER,
-                                          &zoomVariant, NULL);
+#if wxDEBUG_LEVEL
+    HRESULT result =
+#endif
+            m_webBrowser->ExecWB(OLECMDID_ZOOM,
+                                 OLECMDEXECOPT_DONTPROMPTUSER,
+                                 &zoomVariant, NULL);

     wxASSERT(result == S_OK);
 }
 
     wxASSERT(result == S_OK);
 }
 


@@ -194,9 +212,12 @@ wxWebViewZoom wxWebViewIE::GetIETextZoom() const
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
 
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
 

-    HRESULT result = m_webBrowser->ExecWB(OLECMDID_ZOOM,
-                                          OLECMDEXECOPT_DONTPROMPTUSER,
-                                          NULL, &zoomVariant);
+#if wxDEBUG_LEVEL
+    HRESULT result =
+#endif
+            m_webBrowser->ExecWB(OLECMDID_ZOOM,
+                                 OLECMDEXECOPT_DONTPROMPTUSER,
+                                 NULL, &zoomVariant);

     wxASSERT(result == S_OK);
 
     //We can safely cast here as we know that the range matches our enum
     wxASSERT(result == S_OK);
 
     //We can safely cast here as we know that the range matches our enum


@@ -233,10 +254,13 @@ void wxWebViewIE::SetIEOpticalZoom(wxWebViewZoom level)
             wxFAIL;
     }
 
             wxFAIL;
     }
 

-    HRESULT result = m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/,
-                                          OLECMDEXECOPT_DODEFAULT,
-                                          &zoomVariant,
-                                          NULL);
+#if wxDEBUG_LEVEL
+    HRESULT result =
+#endif
+            m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/,
+                                 OLECMDEXECOPT_DODEFAULT,
+                                 &zoomVariant,
+                                 NULL);

     wxASSERT(result == S_OK);
 }
 
     wxASSERT(result == S_OK);
 }
 


@@ -246,9 +270,12 @@ wxWebViewZoom wxWebViewIE::GetIEOpticalZoom() const
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
 
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
 

-    HRESULT result = m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/,
-                                          OLECMDEXECOPT_DODEFAULT, NULL,
-                                          &zoomVariant);
+#if wxDEBUG_LEVEL
+    HRESULT result =
+#endif
+            m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/,
+                                 OLECMDEXECOPT_DODEFAULT, NULL,
+                                 &zoomVariant);

     wxASSERT(result == S_OK);
 
     const int zoom = V_I4(&zoomVariant);
     wxASSERT(result == S_OK);
 
     const int zoom = V_I4(&zoomVariant);


@@ -425,9 +452,12 @@ void wxWebViewIE::SetOfflineMode(bool offline)
 {
     // FIXME: the wxWidgets docs do not really document what the return
     //        parameter of PutProperty is
 {
     // FIXME: the wxWidgets docs do not really document what the return
     //        parameter of PutProperty is

-    const bool success = m_ie.PutProperty("Offline", (offline ?
-                                                      VARIANT_TRUE :
-                                                      VARIANT_FALSE));
+#if wxDEBUG_LEVEL
+    const bool success =
+#endif
+            m_ie.PutProperty("Offline", (offline ?
+                                         VARIANT_TRUE :
+                                         VARIANT_FALSE));

     wxASSERT(success);
 }
 
     wxASSERT(success);
 }
 


@@ -665,7 +695,6 @@ void wxWebViewIE::RunScript(const wxString& javascript)
 
 void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
 {
 
 void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
 {

-#ifndef __MINGW32__

     wxDynamicLibrary urlMon(wxT("urlmon.dll"));
     if(urlMon.HasSymbol(wxT("CoInternetGetSession")))
     {
     wxDynamicLibrary urlMon(wxT("urlmon.dll"));
     if(urlMon.HasSymbol(wxT("CoInternetGetSession")))
     {


@@ -685,12 +714,12 @@ void wxWebViewIE::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
         {
             wxFAIL_MSG("Could not register protocol");
         }
         {
             wxFAIL_MSG("Could not register protocol");
         }

+        m_factories.push_back(cf);

     }
     else
     {
         wxFAIL_MSG("urlmon does not contain CoInternetGetSession");
     }
     }
     else
     {
         wxFAIL_MSG("urlmon does not contain CoInternetGetSession");
     }

-#endif

 }
 
 bool wxWebViewIE::CanExecCommand(wxString command) const
 }
 
 bool wxWebViewIE::CanExecCommand(wxString command) const


@@ -977,8 +1006,6 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
     evt.Skip();
 }
 
     evt.Skip();
 }
 

-#ifndef __MINGW32__
-

 VirtualProtocol::VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler)
 {
     m_refCount = 0;
 VirtualProtocol::VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler)
 {
     m_refCount = 0;


@@ -1148,6 +1175,4 @@ ULONG ClassFactory::Release(void)
 
 } 
 
 
 } 
 

-#endif // __MINGW32__
-

 #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE
 #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE