Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-Authored-By: Maarten <MaartenBent@users.noreply.github.com>
This commit is contained in:
Tobias Taschner
2020-01-16 10:15:11 +01:00
committed by GitHub
parent 12c462d424
commit 41f4a21736
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/cmake/lib/webview/CMakeLists.txt
View File

@@ -36,18 +36,18 @@ if(APPLE)
wx_lib_link_libraries(webview PUBLIC "-framework WebKit") wx_lib_link_libraries(webview PUBLIC "-framework WebKit")
elseif(WXMSW) elseif(WXMSW)
if(wxUSE_WEBVIEW_EDGE) if(wxUSE_WEBVIEW_EDGE)
wx_lib_include_directories(webview PRIVATE ${PROJECT_SOURCE_DIR}/3rdparty/webview2/build/native/include) wx_lib_include_directories(webview PRIVATE "${PROJECT_SOURCE_DIR}/3rdparty/webview2/build/native/include")
if (${CMAKE_SIZEOF_VOID_P} EQUAL 4) if (CMAKE_SIZEOF_VOID_P EQUAL 4)
set(WEBVIEW2_ARCH x86) set(WEBVIEW2_ARCH x86)
else() else()
set(WEBVIEW2_ARCH x64) set(WEBVIEW2_ARCH x64)
endif() endif()
add_custom_command(TARGET webview POST_BUILD add_custom_command(TARGET webview POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
"${PROJECT_SOURCE_DIR}/3rdparty/webview2/build/native/${WEBVIEW2_ARCH}/WebView2Loader.dll" "${PROJECT_SOURCE_DIR}/3rdparty/webview2/build/native/${WEBVIEW2_ARCH}/WebView2Loader.dll"
$<TARGET_FILE_DIR:webview>/"WebView2Loader.dll") "$<TARGET_FILE_DIR:webview>/WebView2Loader.dll")
endif() endif()
elseif(WXGTK) elseif(WXGTK)
if(LIBSOUP_FOUND) if(LIBSOUP_FOUND)

2
include/wx/msw/private/webview_edge.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: include/wx/msw/webview_edge.h // Name: include/wx/msw/private/webview_edge.h
// Purpose: wxMSW Edge Chromium wxWebView backend private classes // Purpose: wxMSW Edge Chromium wxWebView backend private classes
// Author: Tobias Taschner // Author: Tobias Taschner
// Created: 2020-01-15 // Created: 2020-01-15

2
include/wx/msw/webviewhistoryitem_ie.h
View File

@@ -11,7 +11,7 @@
#include "wx/setup.h" #include "wx/setup.h"
#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_IE || wxUSE_WEBVIEW_EDGE) && defined(__WXMSW__) #if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_IE || wxUSE_WEBVIEW_EDGE) && defined(__WXMSW__)
class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
{ {