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
This commit is contained in:
Vadim Zeitlin
2012-05-26 12:29:39 +00:00
parent 5fb4b6cd65
commit fcb9299bda
5 changed files with 14 additions and 6 deletions

View File

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

View File

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

View File

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