cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
bc7a3ceeba
wxWidgets/include/wx/osx/core/objcid.h

25 lines
911 B
C
Raw Normal View History

Use wxObjCID instead of "struct objc_object*" to fix clang build. Clang doesn't accept "struct objc_object*" as synonym for "id" in Objective-C code, so use the real "id" for it while still using the struct pointer for C++ code where "id" is not defined. Closes #13565. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 16:29:50 -04:00
///////////////////////////////////////////////////////////////////////////////
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
2012-05-26 08:29:39 -04:00
// Name: wx/osx/core/objcid.h
Use wxObjCID instead of "struct objc_object*" to fix clang build. Clang doesn't accept "struct objc_object*" as synonym for "id" in Objective-C code, so use the real "id" for it while still using the struct pointer for C++ code where "id" is not defined. Closes #13565. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 16:29:50 -04:00
// Purpose: Define wxObjCID working in both C++ and Objective-C.
// Author: Vadim Zeitlin
// Created: 2012-05-20
// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
// Copyright: (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
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
2012-05-26 08:29:39 -04:00
#ifndef _WX_OSX_CORE_OBJCID_H_
#define _WX_OSX_CORE_OBJCID_H_
Use wxObjCID instead of "struct objc_object*" to fix clang build. Clang doesn't accept "struct objc_object*" as synonym for "id" in Objective-C code, so use the real "id" for it while still using the struct pointer for C++ code where "id" is not defined. Closes #13565. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 16:29:50 -04:00
// ----------------------------------------------------------------------------
// wxObjCID: Equivalent of Objective-C "id" that works in C++ code.
// ----------------------------------------------------------------------------
#ifdef __OBJC__
#define wxObjCID id
#else
typedef struct objc_object* wxObjCID;
#endif
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
2012-05-26 08:29:39 -04:00
#endif // _WX_OSX_CORE_OBJCID_H_
Reference in New Issue Copy Permalink