From e67c814765f7217029451e2c60abe474130d1f50 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Thu, 14 Nov 2019 00:04:56 +0100 Subject: [PATCH] Make webview_missing.h a private header --- Makefile.in | 7 ++----- build/bakefiles/files.bkl | 1 - build/cmake/files.cmake | 1 - build/files | 1 - build/msw/wx_vc7_core.vcproj | 3 --- build/msw/wx_vc7_webview.vcproj | 3 --- build/msw/wx_vc8_core.vcproj | 4 ---- build/msw/wx_vc8_webview.vcproj | 4 ---- build/msw/wx_vc9_core.vcproj | 4 ---- build/msw/wx_vc9_webview.vcproj | 4 ---- include/wx/msw/private/webview_ie.h | 2 +- include/wx/msw/{ => private}/webview_missing.h | 2 +- 12 files changed, 4 insertions(+), 32 deletions(-) rename include/wx/msw/{ => private}/webview_missing.h (99%) diff --git a/Makefile.in b/Makefile.in index ce577fd5a1..b7e7839185 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2260,11 +2260,8 @@ COND_PLATFORM_WIN32_1_GTK_PLATFORM_HDR = \ @COND_TOOLKIT_GTK@WEBVIEW_HDR_PLATFORM = \ @COND_TOOLKIT_GTK@ wx/gtk/webviewhistoryitem_webkit.h \ @COND_TOOLKIT_GTK@ wx/gtk/webview_webkit.h -COND_TOOLKIT_MSW_WEBVIEW_HDR_PLATFORM = \ - wx/msw/webviewhistoryitem_ie.h \ - wx/msw/webview_ie.h \ - wx/msw/webview_missing.h -@COND_TOOLKIT_MSW@WEBVIEW_HDR_PLATFORM = $(COND_TOOLKIT_MSW_WEBVIEW_HDR_PLATFORM) +@COND_TOOLKIT_MSW@WEBVIEW_HDR_PLATFORM = \ +@COND_TOOLKIT_MSW@ wx/msw/webviewhistoryitem_ie.h wx/msw/webview_ie.h @COND_TOOLKIT_COCOA@OPENGL_HDR_PLATFORM = wx/cocoa/glcanvas.h @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@OPENGL_HDR_PLATFORM \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ = wx/gtk1/glcanvas.h wx/unix/glx11.h diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 16f040b93b..b783e026ef 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -3034,7 +3034,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/msw/webviewhistoryitem_ie.h wx/msw/webview_ie.h - wx/msw/webview_missing.h wx/gtk/webviewhistoryitem_webkit.h diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index 49c01f7c49..cae8d70616 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -2844,7 +2844,6 @@ set(WEBVIEW_CMN_SRC set(WEBVIEW_MSW_HDR wx/msw/webviewhistoryitem_ie.h wx/msw/webview_ie.h - wx/msw/webview_missing.h ) set(WEBVIEW_CMN_HDR diff --git a/build/files b/build/files index 7cde92cd14..95cffdbdb1 100644 --- a/build/files +++ b/build/files @@ -2794,7 +2794,6 @@ WEBVIEW_CMN_SRC = WEBVIEW_MSW_HDR = wx/msw/webviewhistoryitem_ie.h wx/msw/webview_ie.h - wx/msw/webview_missing.h WEBVIEW_CMN_HDR = wx/webview.h wx/webviewarchivehandler.h diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 7f8326a20e..8c4e9ac58f 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -1796,9 +1796,6 @@ - - diff --git a/build/msw/wx_vc7_webview.vcproj b/build/msw/wx_vc7_webview.vcproj index 9513cd8db6..522b47e610 100644 --- a/build/msw/wx_vc7_webview.vcproj +++ b/build/msw/wx_vc7_webview.vcproj @@ -424,9 +424,6 @@ - - diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index f3df7999c8..92ad1ed4f3 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -2897,10 +2897,6 @@ RelativePath="..\..\include\wx\msw\webview_ie.h" > - - diff --git a/build/msw/wx_vc8_webview.vcproj b/build/msw/wx_vc8_webview.vcproj index b1d66cfcb5..4d2fe2b651 100644 --- a/build/msw/wx_vc8_webview.vcproj +++ b/build/msw/wx_vc8_webview.vcproj @@ -1068,10 +1068,6 @@ RelativePath="..\..\include\wx\msw\webview_ie.h" > - - diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 1a26f11afe..c27fa05903 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -2893,10 +2893,6 @@ RelativePath="..\..\include\wx\msw\webview_ie.h" > - - diff --git a/build/msw/wx_vc9_webview.vcproj b/build/msw/wx_vc9_webview.vcproj index feb9213cfc..48f3bf6469 100644 --- a/build/msw/wx_vc9_webview.vcproj +++ b/build/msw/wx_vc9_webview.vcproj @@ -1064,10 +1064,6 @@ RelativePath="..\..\include\wx\msw\webview_ie.h" > - - diff --git a/include/wx/msw/private/webview_ie.h b/include/wx/msw/private/webview_ie.h index 85523fd532..d350340f30 100644 --- a/include/wx/msw/private/webview_ie.h +++ b/include/wx/msw/private/webview_ie.h @@ -11,7 +11,7 @@ #include "wx/msw/ole/automtn.h" #include "wx/msw/private/comptr.h" -#include "wx/msw/webview_missing.h" +#include "wx/msw/private/webview_missing.h" class ClassFactory; class wxIEContainer; diff --git a/include/wx/msw/webview_missing.h b/include/wx/msw/private/webview_missing.h similarity index 99% rename from include/wx/msw/webview_missing.h rename to include/wx/msw/private/webview_missing.h index 73820cc04a..2efadd9f0c 100644 --- a/include/wx/msw/webview_missing.h +++ b/include/wx/msw/private/webview_missing.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/msw/webview_missing.h +// Name: include/wx/msw/private/webview_missing.h // Purpose: Definitions / classes commonly missing used by wxWebViewIE // Author: Steven Lamerton // Copyright: (c) 2012 Steven Lamerton