diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 774cbaf26d..fa4d8a80f4 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3340,9 +3340,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
- src/msw/webviewie.cpp
- src/gtk/webview.cpp
- src/osx/webview.mm
+ src/msw/webview_ie.cpp
+ src/gtk/webview_webkit.cpp
+ src/osx/webview_webkit.mm
$(WEB_SRC_PLATFORM)
@@ -3350,9 +3350,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
- wx/msw/webviewie.h
- wx/gtk/webview.h
- wx/osx/webview.h
+ wx/msw/webview_ie.h
+ wx/gtk/webview_webkit.h
+ wx/osx/webview_webkit.h
$(WEB_HDR_PLATFORM)
diff --git a/include/wx/gtk/webview.h b/include/wx/gtk/webview_webkit.h
similarity index 100%
rename from include/wx/gtk/webview.h
rename to include/wx/gtk/webview_webkit.h
diff --git a/include/wx/msw/webviewie.h b/include/wx/msw/webview_ie.h
similarity index 100%
rename from include/wx/msw/webviewie.h
rename to include/wx/msw/webview_ie.h
diff --git a/include/wx/osx/webview.h b/include/wx/osx/webview_webkit.h
similarity index 100%
rename from include/wx/osx/webview.h
rename to include/wx/osx/webview_webkit.h
diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index 9d710449fe..f9d9553803 100644
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -18,9 +18,9 @@
#include "wx/webview.h"
-#include "wx/osx/webview.h"
-#include "wx/gtk/webview.h"
-#include "wx/msw/webviewie.h"
+#include "wx/osx/webview_webkit.h"
+#include "wx/gtk/webview_webkit.h"
+#include "wx/msw/webview_ie.h"
// DLL options compatibility check:
#include "wx/app.h"
diff --git a/src/gtk/webview.cpp b/src/gtk/webview_webkit.cpp
similarity index 99%
rename from src/gtk/webview.cpp
rename to src/gtk/webview_webkit.cpp
index 915f86b70b..3fa92ff293 100644
--- a/src/gtk/webview.cpp
+++ b/src/gtk/webview_webkit.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/webview.cpp
+// Name: src/gtk/webview_webkit.cpp
// Purpose: GTK WebKit backend for web view component
// Author: Marianne Gagnon, Robert Roebling
// Id: $Id$
@@ -14,7 +14,7 @@
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT
#include "wx/stockitem.h"
-#include "wx/gtk/webview.h"
+#include "wx/gtk/webview_webkit.h"
#include "wx/gtk/control.h"
#include "wx/gtk/private.h"
#include "webkit/webkit.h"
diff --git a/src/msw/webviewie.cpp b/src/msw/webview_ie.cpp
similarity index 98%
rename from src/msw/webviewie.cpp
rename to src/msw/webview_ie.cpp
index 4b7dabe02b..668e1c8958 100644
--- a/src/msw/webviewie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/msw/webviewie.cpp
+// Name: src/msw/webview_ie.cpp
// Purpose: wxMSW wxWebViewIE class implementation for web view component
// Author: Marianne Gagnon
// Id: $Id$
@@ -14,7 +14,7 @@
#pragma hdrstop
#endif
-#include "wx/msw/webviewie.h"
+#include "wx/msw/webview_ie.h"
#if wxHAVE_WEB_BACKEND_IE
@@ -384,9 +384,12 @@ void wxWebViewIE::Reload(wxWebViewReloadFlags flags)
if (flags & wxWEB_VIEW_RELOAD_NO_CACHE)
{
- VARIANTARG level;
- level.vt = VT_I2;
- level.iVal = 3;
+ wxVariant level(REFRESH_COMPLETELY, "VT_I2");
+ //level = 3;
+ // VARIANTARG level;
+ // VariantInit(&level);
+ // V_VT(&level) = VT_I2;
+ // V_I2(&level) = REFRESH_COMPLETELY;
out = m_ie.CallMethod("Refresh2", &level);
}
else
diff --git a/src/osx/webview.mm b/src/osx/webview_webkit.mm
similarity index 99%
rename from src/osx/webview.mm
rename to src/osx/webview_webkit.mm
index 15b855297d..a6b0943d83 100644
--- a/src/osx/webview.mm
+++ b/src/osx/webview_webkit.mm
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
-// Name: src/osx/webkit.mm
+// Name: src/osx/webview_webkit.mm
// Purpose: wxOSXWebKitCtrl - embeddable web kit control,
// OS X implementation of web view component
// Author: Jethro Grassie / Kevin Ollivier / Marianne Gagnon
@@ -12,7 +12,7 @@
// http://developer.apple.com/mac/library/documentation/Cocoa/Reference/WebKit/Classes/WebView_Class/Reference/Reference.html
-#include "wx/osx/webview.h"
+#include "wx/osx/webview_webkit.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"