From 69e4f491b240927dcd816dc8e376957149b07fdb Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Wed, 3 May 2017 23:35:13 -0400 Subject: [PATCH] Move wx/gtk/webview_webkit2_extension.h to private directory Make it more clear that this header is private, i.e. used only by the library itself. Close https://github.com/wxWidgets/wxWidgets/pull/473 --- include/wx/gtk/{ => private}/webview_webkit2_extension.h | 8 ++++---- src/gtk/webview_webkit2.cpp | 2 +- src/gtk/webview_webkit2_extension.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename include/wx/gtk/{ => private}/webview_webkit2_extension.h (67%) diff --git a/include/wx/gtk/webview_webkit2_extension.h b/include/wx/gtk/private/webview_webkit2_extension.h similarity index 67% rename from include/wx/gtk/webview_webkit2_extension.h rename to include/wx/gtk/private/webview_webkit2_extension.h index f554d69daa..0fbf1df5cd 100644 --- a/include/wx/gtk/webview_webkit2_extension.h +++ b/include/wx/gtk/private/webview_webkit2_extension.h @@ -1,15 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/gtk/wx/webview_webkit2_extension.h +// Name: include/wx/gtk/private/webview_webkit2_extension.h // Purpose: Common elements for webview webkit2 extension // Author: Scott Talbert // Copyright: (c) 2017 Scott Talbert // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_GTK_WEBVIEW_WEBKIT2_EXTENSION_H_ -#define _WX_GTK_WEBVIEW_WEBKIT2_EXTENSION_H_ +#ifndef _WX_GTK_PRIVATE_WEBVIEW_WEBKIT2_EXTENSION_H_ +#define _WX_GTK_PRIVATE_WEBVIEW_WEBKIT2_EXTENSION_H_ #define WXGTK_WEB_EXTENSION_OBJECT_PATH "/org/wxwidgets/wxGTK/WebExtension" #define WXGTK_WEB_EXTENSION_INTERFACE "org.wxwidgets.wxGTK.WebExtension" -#endif +#endif // _WX_GTK_PRIVATE_WEBVIEW_WEBKIT2_EXTENSION_H_ diff --git a/src/gtk/webview_webkit2.cpp b/src/gtk/webview_webkit2.cpp index 3e3393faab..0d3288006f 100644 --- a/src/gtk/webview_webkit2.cpp +++ b/src/gtk/webview_webkit2.cpp @@ -18,7 +18,7 @@ #include "wx/filesys.h" #include "wx/base64.h" #include "wx/log.h" -#include "wx/gtk/webview_webkit2_extension.h" +#include "wx/gtk/private/webview_webkit2_extension.h" #include // ---------------------------------------------------------------------------- diff --git a/src/gtk/webview_webkit2_extension.cpp b/src/gtk/webview_webkit2_extension.cpp index ddd0d94dfa..3b54165e9a 100644 --- a/src/gtk/webview_webkit2_extension.cpp +++ b/src/gtk/webview_webkit2_extension.cpp @@ -7,7 +7,7 @@ ///////////////////////////////////////////////////////////////////////////// #include "wx/defs.h" -#include "wx/gtk/webview_webkit2_extension.h" +#include "wx/gtk/private/webview_webkit2_extension.h" #include #define WEBKIT_DOM_USE_UNSTABLE_API #include