AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename source files for consistency

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton 2011-05-16 20:49:54 +00:00
parent 97ad1425fe
commit 8290e3cd91
8 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/bakefiles/files.bkl
View File

@ -3340,9 +3340,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- ====================================================================== --> <!-- ====================================================================== -->
<set var="WEB_SRC_PLATFORM"> <set var="WEB_SRC_PLATFORM">
<if cond="TOOLKIT=='MSW'">src/msw/webviewie.cpp</if> <if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>
<if cond="PLATFORM_UNIX=='1'">src/gtk/webview.cpp</if> <if cond="PLATFORM_UNIX=='1'">src/gtk/webview_webkit.cpp</if>
<if cond="PLATFORM_MACOSX=='1'">src/osx/webview.mm</if> <if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
</set> </set>
<set var="WEB_SRC" hints="files"> <set var="WEB_SRC" hints="files">
$(WEB_SRC_PLATFORM) $(WEB_SRC_PLATFORM)
@ -3350,9 +3350,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set> </set>
<set var="WEB_HDR_PLATFORM" hints="files"> <set var="WEB_HDR_PLATFORM" hints="files">
<if cond="TOOLKIT=='MSW'">wx/msw/webviewie.h</if> <if cond="TOOLKIT=='MSW'">wx/msw/webview_ie.h</if>
<if cond="PLATFORM_UNIX=='1'">wx/gtk/webview.h</if> <if cond="PLATFORM_UNIX=='1'">wx/gtk/webview_webkit.h</if>
<if cond="PLATFORM_MACOSX=='1'">wx/osx/webview.h</if> <if cond="PLATFORM_MACOSX=='1'">wx/osx/webview_webkit.h</if>
</set> </set>
<set var="WEB_HDR" hints="files"> <set var="WEB_HDR" hints="files">
$(WEB_HDR_PLATFORM) $(WEB_HDR_PLATFORM)

0
include/wx/gtk/webview.h → include/wx/gtk/webview_webkit.h
View File

0
include/wx/msw/webviewie.h → include/wx/msw/webview_ie.h
View File

0
include/wx/osx/webview.h → include/wx/osx/webview_webkit.h
View File

6
src/common/webview.cpp
View File

@ -18,9 +18,9 @@
#include "wx/webview.h" #include "wx/webview.h"
#include "wx/osx/webview.h" #include "wx/osx/webview_webkit.h"
#include "wx/gtk/webview.h" #include "wx/gtk/webview_webkit.h"
#include "wx/msw/webviewie.h" #include "wx/msw/webview_ie.h"
// DLL options compatibility check: // DLL options compatibility check:
#include "wx/app.h" #include "wx/app.h"

4
src/gtk/webview.cpp → src/gtk/webview_webkit.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: src/gtk/webview.cpp // Name: src/gtk/webview_webkit.cpp
// Purpose: GTK WebKit backend for web view component // Purpose: GTK WebKit backend for web view component
// Author: Marianne Gagnon, Robert Roebling // Author: Marianne Gagnon, Robert Roebling
// Id: $Id$ // Id: $Id$
@ -14,7 +14,7 @@
#if wxHAVE_WEB_BACKEND_GTK_WEBKIT #if wxHAVE_WEB_BACKEND_GTK_WEBKIT
#include "wx/stockitem.h" #include "wx/stockitem.h"
#include "wx/gtk/webview.h" #include "wx/gtk/webview_webkit.h"
#include "wx/gtk/control.h" #include "wx/gtk/control.h"
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include "webkit/webkit.h" #include "webkit/webkit.h"

13
src/msw/webviewie.cpp → src/msw/webview_ie.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: src/msw/webviewie.cpp // Name: src/msw/webview_ie.cpp
// Purpose: wxMSW wxWebViewIE class implementation for web view component // Purpose: wxMSW wxWebViewIE class implementation for web view component
// Author: Marianne Gagnon // Author: Marianne Gagnon
// Id: $Id$ // Id: $Id$
@ -14,7 +14,7 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#include "wx/msw/webviewie.h" #include "wx/msw/webview_ie.h"
#if wxHAVE_WEB_BACKEND_IE #if wxHAVE_WEB_BACKEND_IE
@ -384,9 +384,12 @@ void wxWebViewIE::Reload(wxWebViewReloadFlags flags)
if (flags & wxWEB_VIEW_RELOAD_NO_CACHE) if (flags & wxWEB_VIEW_RELOAD_NO_CACHE)
{ {
VARIANTARG level; wxVariant level(REFRESH_COMPLETELY, "VT_I2");
level.vt = VT_I2; //level = 3;
level.iVal = 3; // VARIANTARG level;
// VariantInit(&level);
// V_VT(&level) = VT_I2;
// V_I2(&level) = REFRESH_COMPLETELY;
out = m_ie.CallMethod("Refresh2", &level); out = m_ie.CallMethod("Refresh2", &level);
} }
else else

4
src/osx/webview.mm → src/osx/webview_webkit.mm
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: src/osx/webkit.mm // Name: src/osx/webview_webkit.mm
// Purpose: wxOSXWebKitCtrl - embeddable web kit control, // Purpose: wxOSXWebKitCtrl - embeddable web kit control,
// OS X implementation of web view component // OS X implementation of web view component
// Author: Jethro Grassie / Kevin Ollivier / Marianne Gagnon // 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 // 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". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"