From fcb9299bda7367d86c3b9f7472ce1f2bbd02a847 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 26 May 2012 12:29:39 +0000 Subject: [PATCH] Move include/wx/osx/private/objcid.h to include/wx/osx/core. This header is used by public headers and hence is not really private, move it to a better place and add it to the list of OSX headers in the bakefile. Closes #14339. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 7 +++++++ build/bakefiles/files.bkl | 1 + include/wx/osx/{private => core}/objcid.h | 8 ++++---- include/wx/osx/webview_webkit.h | 2 +- include/wx/osx/webviewhistoryitem_webkit.h | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) rename include/wx/osx/{private => core}/objcid.h (84%) diff --git a/Makefile.in b/Makefile.in index 6f406b5587..0781fd86f6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2332,6 +2332,7 @@ COND_TOOLKIT_OSX_CARBON_BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h \ @@ -2352,6 +2353,7 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h \ @@ -2385,6 +2387,7 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h @@ -2407,6 +2410,7 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h @@ -2429,6 +2433,7 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h @@ -2451,6 +2456,7 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h @@ -2473,6 +2479,7 @@ COND_TOOLKIT__BASE_OSX_HDR = \ wx/osx/core/cfref.h \ wx/osx/core/cfstring.h \ wx/osx/core/hid.h \ + wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/stdpaths.h \ wx/osx/core/private/strconv_cf.h diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index d5782a7b23..95db06d323 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -197,6 +197,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/osx/core/cfref.h wx/osx/core/cfstring.h wx/osx/core/hid.h + wx/osx/core/objcid.h wx/osx/core/private.h wx/osx/core/stdpaths.h wx/osx/core/private/strconv_cf.h diff --git a/include/wx/osx/private/objcid.h b/include/wx/osx/core/objcid.h similarity index 84% rename from include/wx/osx/private/objcid.h rename to include/wx/osx/core/objcid.h index 59d044d9c8..ba10ed6729 100644 --- a/include/wx/osx/private/objcid.h +++ b/include/wx/osx/core/objcid.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: osx/private/objcid.h +// Name: wx/osx/core/objcid.h // Purpose: Define wxObjCID working in both C++ and Objective-C. // Author: Vadim Zeitlin // Created: 2012-05-20 @@ -8,8 +8,8 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifndef _WX_OSX_PRIVATE_OBJCID_H_ -#define _WX_OSX_PRIVATE_OBJCID_H_ +#ifndef _WX_OSX_CORE_OBJCID_H_ +#define _WX_OSX_CORE_OBJCID_H_ // ---------------------------------------------------------------------------- // wxObjCID: Equivalent of Objective-C "id" that works in C++ code. @@ -21,4 +21,4 @@ typedef struct objc_object* wxObjCID; #endif -#endif // _WX_OSX_PRIVATE_OBJCID_H_ +#endif // _WX_OSX_CORE_OBJCID_H_ diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h index 76b66e19ae..3edc601c84 100644 --- a/include/wx/osx/webview_webkit.h +++ b/include/wx/osx/webview_webkit.h @@ -21,7 +21,7 @@ #include "wx/control.h" #include "wx/webview.h" -#include "wx/osx/private/objcid.h" +#include "wx/osx/core/objcid.h" // ---------------------------------------------------------------------------- // Web Kit Control diff --git a/include/wx/osx/webviewhistoryitem_webkit.h b/include/wx/osx/webviewhistoryitem_webkit.h index 13cddf5f30..deeea9ba41 100644 --- a/include/wx/osx/webviewhistoryitem_webkit.h +++ b/include/wx/osx/webviewhistoryitem_webkit.h @@ -15,7 +15,7 @@ #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \ || defined(__WXOSX_CARBON__)) -#include "wx/osx/private/objcid.h" +#include "wx/osx/core/objcid.h" class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem { -- 2.50.0