Separated the Objective-C to C++ association code into the new header
ObjcAssociate.h. That leaves ObjcPose.h for its original purpose and avoids including it from any header files. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
fb45bb1fb2
commit
e668651137
@ -1197,6 +1197,7 @@ NSPanel.h CocoaH
|
|||||||
NSTextField.h CocoaH
|
NSTextField.h CocoaH
|
||||||
NSView.h CocoaH
|
NSView.h CocoaH
|
||||||
NSWindow.h CocoaH
|
NSWindow.h CocoaH
|
||||||
|
ObjcAssociate.h CocoaH
|
||||||
ObjcPose.h CocoaH
|
ObjcPose.h CocoaH
|
||||||
# wx implementations
|
# wx implementations
|
||||||
app.h CocoaH
|
app.h CocoaH
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#define __WX_COCOA_NSBOX_H__
|
#define __WX_COCOA_NSBOX_H__
|
||||||
|
|
||||||
#include "wx/hashmap.h"
|
#include "wx/hashmap.h"
|
||||||
#include "wx/cocoa/ObjcPose.h"
|
#include "wx/cocoa/ObjcAssociate.h"
|
||||||
|
|
||||||
WX_DECLARE_OBJC_HASHMAP(NSBox);
|
WX_DECLARE_OBJC_HASHMAP(NSBox);
|
||||||
class wxCocoaNSBox
|
class wxCocoaNSBox
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#define __WX_COCOA_NSBUTTON_H__
|
#define __WX_COCOA_NSBUTTON_H__
|
||||||
|
|
||||||
#include "wx/hashmap.h"
|
#include "wx/hashmap.h"
|
||||||
#include "wx/cocoa/ObjcPose.h"
|
#include "wx/cocoa/ObjcAssociate.h"
|
||||||
|
|
||||||
WX_DECLARE_OBJC_HASHMAP(NSButton);
|
WX_DECLARE_OBJC_HASHMAP(NSButton);
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#define __WX_COCOA_NSCONTROL_H__
|
#define __WX_COCOA_NSCONTROL_H__
|
||||||
|
|
||||||
#include "wx/hashmap.h"
|
#include "wx/hashmap.h"
|
||||||
#include "wx/cocoa/ObjcPose.h"
|
#include "wx/cocoa/ObjcAssociate.h"
|
||||||
|
|
||||||
WX_DECLARE_OBJC_HASHMAP(NSControl);
|
WX_DECLARE_OBJC_HASHMAP(NSControl);
|
||||||
class wxCocoaNSControl
|
class wxCocoaNSControl
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#define __WX_COCOA_NSMENU_H__
|
#define __WX_COCOA_NSMENU_H__
|
||||||
|
|
||||||
#include "wx/hashmap.h"
|
#include "wx/hashmap.h"
|
||||||
#include "wx/cocoa/ObjcPose.h"
|
#include "wx/cocoa/ObjcAssociate.h"
|
||||||
|
|
||||||
WX_DECLARE_OBJC_HASHMAP(NSMenu);
|
WX_DECLARE_OBJC_HASHMAP(NSMenu);
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#define __WX_COCOA_NSPANEL_H__
|
#define __WX_COCOA_NSPANEL_H__
|
||||||
|
|
||||||
#include "wx/hashmap.h"
|
#include "wx/hashmap.h"
|
||||||
#include "wx/cocoa/ObjcPose.h"
|
#include "wx/cocoa/ObjcAssociate.h"
|
||||||
|
|
||||||
WX_DECLARE_OBJC_HASHMAP(NSPanel);
|
WX_DECLARE_OBJC_HASHMAP(NSPanel);
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#define __WX_COCOA_NSTEXTFIELD_H__
|
#define __WX_COCOA_NSTEXTFIELD_H__
|
||||||
|
|
||||||
#include "wx/hashmap.h"
|
#include "wx/hashmap.h"
|
||||||
#include "wx/cocoa/ObjcPose.h"
|
#include "wx/cocoa/ObjcAssociate.h"
|
||||||
|
|
||||||
WX_DECLARE_OBJC_HASHMAP(NSTextField);
|
WX_DECLARE_OBJC_HASHMAP(NSTextField);
|
||||||
class wxCocoaNSTextField
|
class wxCocoaNSTextField
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#define __WX_COCOA_NSVIEW_H__
|
#define __WX_COCOA_NSVIEW_H__
|
||||||
|
|
||||||
#include "wx/hashmap.h"
|
#include "wx/hashmap.h"
|
||||||
#include "wx/cocoa/ObjcPose.h"
|
#include "wx/cocoa/ObjcAssociate.h"
|
||||||
|
|
||||||
typedef struct _NSRect NSRect;
|
typedef struct _NSRect NSRect;
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#define __WX_COCOA_NSWINDOW_H__
|
#define __WX_COCOA_NSWINDOW_H__
|
||||||
|
|
||||||
#include "wx/hashmap.h"
|
#include "wx/hashmap.h"
|
||||||
#include "wx/cocoa/ObjcPose.h"
|
#include "wx/cocoa/ObjcAssociate.h"
|
||||||
|
|
||||||
WX_DECLARE_OBJC_HASHMAP(NSWindow);
|
WX_DECLARE_OBJC_HASHMAP(NSWindow);
|
||||||
|
|
||||||
|
79
include/wx/cocoa/ObjcAssociate.h
Normal file
79
include/wx/cocoa/ObjcAssociate.h
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
// Name: wx/cocoa/ObjcAssociate.h
|
||||||
|
// Purpose: Associates an Objective-C class with a C++ class
|
||||||
|
// Author: David Elliott
|
||||||
|
// Modified by:
|
||||||
|
// Created: 2002/12/03
|
||||||
|
// RCS-ID: $Id:
|
||||||
|
// Copyright: (c) 2002 David Elliott <dfe@cox.net>
|
||||||
|
// Licence: wxWindows license
|
||||||
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#ifndef __WX_COCOA_OBJC_ASSOCIATE_H__
|
||||||
|
#define __WX_COCOA_OBJC_ASSOCIATE_H__
|
||||||
|
|
||||||
|
/*-------------------------------------------------------------------------
|
||||||
|
Basic hashmap stuff, used by everything
|
||||||
|
-------------------------------------------------------------------------*/
|
||||||
|
#define WX_DECLARE_OBJC_HASHMAP(ObjcClass) \
|
||||||
|
class wxCocoa##ObjcClass; \
|
||||||
|
WX_DECLARE_HASH_MAP(WX_##ObjcClass,wxCocoa##ObjcClass*,wxPointerHash,wxPointerEqual,wxCocoa##ObjcClass##Hash)
|
||||||
|
|
||||||
|
#define WX_DECLARE_OBJC_INTERFACE_HASHMAP(ObjcClass) \
|
||||||
|
public: \
|
||||||
|
static inline wxCocoa##ObjcClass* GetFromCocoa(WX_##ObjcClass cocoaObjcClass) \
|
||||||
|
{ \
|
||||||
|
wxCocoa##ObjcClass##Hash::iterator iter = sm_cocoaHash.find(cocoaObjcClass); \
|
||||||
|
if(iter!=sm_cocoaHash.end()) \
|
||||||
|
{ \
|
||||||
|
return iter->second; \
|
||||||
|
} \
|
||||||
|
return NULL; \
|
||||||
|
} \
|
||||||
|
protected: \
|
||||||
|
static wxCocoa##ObjcClass##Hash sm_cocoaHash;
|
||||||
|
|
||||||
|
#define WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(ObjcClass) \
|
||||||
|
wxCocoa##ObjcClass##Hash wxCocoa##ObjcClass::sm_cocoaHash;
|
||||||
|
|
||||||
|
|
||||||
|
/*-------------------------------------------------------------------------
|
||||||
|
The entire interface, including some boilerplate stuff
|
||||||
|
-------------------------------------------------------------------------*/
|
||||||
|
#define WX_DECLARE_OBJC_INTERFACE(ObjcClass) \
|
||||||
|
WX_DECLARE_OBJC_INTERFACE_HASHMAP(ObjcClass) \
|
||||||
|
public: \
|
||||||
|
inline void Associate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
|
||||||
|
{ \
|
||||||
|
sm_cocoaHash.insert(wxCocoa##ObjcClass##Hash::value_type(cocoaObjcClass,this)); \
|
||||||
|
} \
|
||||||
|
inline void Disassociate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
|
||||||
|
{ \
|
||||||
|
sm_cocoaHash.erase(cocoaObjcClass); \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define WX_IMPLEMENT_OBJC_INTERFACE(ObjcClass) \
|
||||||
|
WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(ObjcClass)
|
||||||
|
|
||||||
|
/*-------------------------------------------------------------------------
|
||||||
|
Stuff to be used by the wxWindows class (not the Cocoa interface)
|
||||||
|
-------------------------------------------------------------------------*/
|
||||||
|
#define WX_DECLARE_COCOA_OWNER(ObjcClass,ObjcBase,ObjcRoot) \
|
||||||
|
public: \
|
||||||
|
inline WX_##ObjcClass Get##ObjcClass() { return (WX_##ObjcClass)m_cocoa##ObjcRoot; } \
|
||||||
|
inline const WX_##ObjcClass Get##ObjcClass() const { return (WX_##ObjcClass)m_cocoa##ObjcRoot; } \
|
||||||
|
protected: \
|
||||||
|
void Set##ObjcClass(WX_##ObjcClass cocoaObjcClass);
|
||||||
|
|
||||||
|
#define WX_IMPLEMENT_COCOA_OWNER(wxClass,ObjcClass,ObjcBase,ObjcRoot) \
|
||||||
|
void wxClass::Set##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
|
||||||
|
{ \
|
||||||
|
if(m_cocoa##ObjcRoot) \
|
||||||
|
Disassociate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \
|
||||||
|
Set##ObjcBase(cocoaObjcClass); \
|
||||||
|
if(m_cocoa##ObjcRoot) \
|
||||||
|
Associate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // __WX_COCOA_OBJC_ASSOCIATE_H__
|
||||||
|
|
@ -54,70 +54,9 @@ public:
|
|||||||
#define WX_IMPLEMENT_POSER(poser) \
|
#define WX_IMPLEMENT_POSER(poser) \
|
||||||
wxDummyForPoseAsInitializer wxDummyPoseAsInitializerFor##poser(new wxPoseAsInitializer([poser class]))
|
wxDummyForPoseAsInitializer wxDummyPoseAsInitializerFor##poser(new wxPoseAsInitializer([poser class]))
|
||||||
|
|
||||||
|
#else // __OBJC__
|
||||||
|
#warning "Objective-C++ Only!"
|
||||||
#endif // __OBJC__
|
#endif // __OBJC__
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------
|
|
||||||
Basic hashmap stuff, used by everything
|
|
||||||
-------------------------------------------------------------------------*/
|
|
||||||
#define WX_DECLARE_OBJC_HASHMAP(ObjcClass) \
|
|
||||||
class wxCocoa##ObjcClass; \
|
|
||||||
WX_DECLARE_HASH_MAP(WX_##ObjcClass,wxCocoa##ObjcClass*,wxPointerHash,wxPointerEqual,wxCocoa##ObjcClass##Hash)
|
|
||||||
|
|
||||||
#define WX_DECLARE_OBJC_INTERFACE_HASHMAP(ObjcClass) \
|
|
||||||
public: \
|
|
||||||
static inline wxCocoa##ObjcClass* GetFromCocoa(WX_##ObjcClass cocoaObjcClass) \
|
|
||||||
{ \
|
|
||||||
wxCocoa##ObjcClass##Hash::iterator iter = sm_cocoaHash.find(cocoaObjcClass); \
|
|
||||||
if(iter!=sm_cocoaHash.end()) \
|
|
||||||
{ \
|
|
||||||
return iter->second; \
|
|
||||||
} \
|
|
||||||
return NULL; \
|
|
||||||
} \
|
|
||||||
protected: \
|
|
||||||
static wxCocoa##ObjcClass##Hash sm_cocoaHash;
|
|
||||||
|
|
||||||
#define WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(ObjcClass) \
|
|
||||||
wxCocoa##ObjcClass##Hash wxCocoa##ObjcClass::sm_cocoaHash;
|
|
||||||
|
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------
|
|
||||||
The entire interface, including some boilerplate stuff
|
|
||||||
-------------------------------------------------------------------------*/
|
|
||||||
#define WX_DECLARE_OBJC_INTERFACE(ObjcClass) \
|
|
||||||
WX_DECLARE_OBJC_INTERFACE_HASHMAP(ObjcClass) \
|
|
||||||
public: \
|
|
||||||
inline void Associate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
|
|
||||||
{ \
|
|
||||||
sm_cocoaHash.insert(wxCocoa##ObjcClass##Hash::value_type(cocoaObjcClass,this)); \
|
|
||||||
} \
|
|
||||||
inline void Disassociate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
|
|
||||||
{ \
|
|
||||||
sm_cocoaHash.erase(cocoaObjcClass); \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define WX_IMPLEMENT_OBJC_INTERFACE(ObjcClass) \
|
|
||||||
WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(ObjcClass)
|
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------
|
|
||||||
Stuff to be used by the wxWindows class (not the Cocoa interface)
|
|
||||||
-------------------------------------------------------------------------*/
|
|
||||||
#define WX_DECLARE_COCOA_OWNER(ObjcClass,ObjcBase,ObjcRoot) \
|
|
||||||
public: \
|
|
||||||
inline WX_##ObjcClass Get##ObjcClass() { return (WX_##ObjcClass)m_cocoa##ObjcRoot; } \
|
|
||||||
inline const WX_##ObjcClass Get##ObjcClass() const { return (WX_##ObjcClass)m_cocoa##ObjcRoot; } \
|
|
||||||
protected: \
|
|
||||||
void Set##ObjcClass(WX_##ObjcClass cocoaObjcClass);
|
|
||||||
|
|
||||||
#define WX_IMPLEMENT_COCOA_OWNER(wxClass,ObjcClass,ObjcBase,ObjcRoot) \
|
|
||||||
void wxClass::Set##ObjcClass(WX_##ObjcClass cocoaObjcClass) \
|
|
||||||
{ \
|
|
||||||
if(m_cocoa##ObjcRoot) \
|
|
||||||
Disassociate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \
|
|
||||||
Set##ObjcBase(cocoaObjcClass); \
|
|
||||||
if(m_cocoa##ObjcRoot) \
|
|
||||||
Associate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // __WX_COCOA_PRIVATE_POSER_H__
|
#endif // __WX_COCOA_PRIVATE_POSER_H__
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user