From 41f4a21736f635dbad836ed26e06357d79cfd157 Mon Sep 17 00:00:00 2001 From: Tobias Taschner Date: Thu, 16 Jan 2020 10:15:11 +0100 Subject: [PATCH] Apply suggestions from code review Co-Authored-By: Maarten --- build/cmake/lib/webview/CMakeLists.txt | 8 ++++---- include/wx/msw/private/webview_edge.h | 2 +- include/wx/msw/webviewhistoryitem_ie.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt index 261c6c61ee..4645032097 100644 --- a/build/cmake/lib/webview/CMakeLists.txt +++ b/build/cmake/lib/webview/CMakeLists.txt @@ -36,18 +36,18 @@ if(APPLE) wx_lib_link_libraries(webview PUBLIC "-framework WebKit") elseif(WXMSW) 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) else() set(WEBVIEW2_ARCH x64) endif() 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" - $/"WebView2Loader.dll") + "$/WebView2Loader.dll") endif() elseif(WXGTK) if(LIBSOUP_FOUND) diff --git a/include/wx/msw/private/webview_edge.h b/include/wx/msw/private/webview_edge.h index 8793834d7f..4aca6fae4a 100644 --- a/include/wx/msw/private/webview_edge.h +++ b/include/wx/msw/private/webview_edge.h @@ -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 // Author: Tobias Taschner // Created: 2020-01-15 diff --git a/include/wx/msw/webviewhistoryitem_ie.h b/include/wx/msw/webviewhistoryitem_ie.h index e719b82a9f..b34dd08f06 100644 --- a/include/wx/msw/webviewhistoryitem_ie.h +++ b/include/wx/msw/webviewhistoryitem_ie.h @@ -11,7 +11,7 @@ #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 {