From 0dffac1829ad25fd444f26aebae13baccf49855a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 5 Sep 2023 16:10:48 +0200 Subject: [PATCH] Add private header for wxWebViewChromium Mac-specific functions Instead of just declaring the function inline in the common code, do it in a header included from both common C++ and Mac Objective C++ sources. No real changes. --- include/wx/osx/private/webview_chromium.h | 16 ++++++++++++++++ src/common/webview_chromium.cpp | 8 ++++---- src/osx/webview_chromium.mm | 3 +++ 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 include/wx/osx/private/webview_chromium.h diff --git a/include/wx/osx/private/webview_chromium.h b/include/wx/osx/private/webview_chromium.h new file mode 100644 index 0000000000..79fa14f1cb --- /dev/null +++ b/include/wx/osx/private/webview_chromium.h @@ -0,0 +1,16 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: wx/osx/private/webview_chromium.h +// Purpose: Functions used in wxWebViewChromium Mac implementation +// Author: Vadim Zeitlin +// Created: 2023-09-05 +// Copyright: (c) 2023 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_OSX_PRIVATE_WEBVIEW_CHROMIUM_H_ +#define _WX_OSX_PRIVATE_WEBVIEW_CHROMIUM_H_ + +// Called during startup to add CefAppProtocol support to wxNSApplication. +void wxWebViewChromium_InitOSX(); + +#endif // _WX_OSX_PRIVATE_WEBVIEW_CHROMIUM_H_ diff --git a/src/common/webview_chromium.cpp b/src/common/webview_chromium.cpp index d98d68ebb0..64f5a52e7b 100644 --- a/src/common/webview_chromium.cpp +++ b/src/common/webview_chromium.cpp @@ -29,6 +29,10 @@ #include #endif +#ifdef __WXOSX__ +#include "wx/osx/private/webview_chromium.h" +#endif + #ifdef __VISUALC__ #pragma warning(push) #pragma warning(disable:4100) @@ -1238,10 +1242,6 @@ bool SchemeHandler::ReadResponse(void* data_out, return has_data; } -#ifdef __WXOSX__ -void wxWebViewChromium_InitOSX(); -#endif - namespace { diff --git a/src/osx/webview_chromium.mm b/src/osx/webview_chromium.mm index 99c693213c..38cab48bb9 100644 --- a/src/osx/webview_chromium.mm +++ b/src/osx/webview_chromium.mm @@ -12,6 +12,9 @@ #import "Cocoa/Cocoa.h" #include #include "wx/log.h" + +#include "wx/osx/private/webview_chromium.h" + #import "include/cef_application_mac.h" /*