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

@@ -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

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

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_

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

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
 {