mac more native types
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
376d7d9764
commit
6fe8830e92
@ -2500,11 +2500,8 @@ enum wxUpdateUI
|
|||||||
|
|
||||||
#define WX_OPAQUE_TYPE( name ) struct wxOpaque##name
|
#define WX_OPAQUE_TYPE( name ) struct wxOpaque##name
|
||||||
|
|
||||||
typedef void* WXCOLORREF;
|
|
||||||
typedef void* WXCGIMAGEREF;
|
|
||||||
typedef void* WXHBITMAP;
|
typedef void* WXHBITMAP;
|
||||||
typedef void* WXHCURSOR;
|
typedef void* WXHCURSOR;
|
||||||
typedef void* WXHRGN;
|
|
||||||
typedef void* WXRECTPTR;
|
typedef void* WXRECTPTR;
|
||||||
typedef void* WXPOINTPTR;
|
typedef void* WXPOINTPTR;
|
||||||
typedef void* WXHWND;
|
typedef void* WXHWND;
|
||||||
@ -2512,20 +2509,21 @@ typedef void* WXEVENTREF;
|
|||||||
typedef void* WXEVENTHANDLERREF;
|
typedef void* WXEVENTHANDLERREF;
|
||||||
typedef void* WXEVENTHANDLERCALLREF;
|
typedef void* WXEVENTHANDLERCALLREF;
|
||||||
typedef void* WXAPPLEEVENTREF;
|
typedef void* WXAPPLEEVENTREF;
|
||||||
typedef void* WXHDC;
|
|
||||||
typedef void* WXHMENU;
|
typedef void* WXHMENU;
|
||||||
|
|
||||||
typedef unsigned int WXUINT;
|
typedef unsigned int WXUINT;
|
||||||
typedef unsigned long WXDWORD;
|
typedef unsigned long WXDWORD;
|
||||||
typedef unsigned short WXWORD;
|
typedef unsigned short WXWORD;
|
||||||
|
|
||||||
typedef WX_OPAQUE_TYPE(CIconHandle ) * WXHICON ;
|
|
||||||
typedef WX_OPAQUE_TYPE(PicHandle ) * WXHMETAFILE ;
|
typedef WX_OPAQUE_TYPE(PicHandle ) * WXHMETAFILE ;
|
||||||
typedef WX_OPAQUE_TYPE(ControlRef ) * WXWidget ;
|
typedef WX_OPAQUE_TYPE(ControlRef ) * WXWidget ;
|
||||||
typedef WX_OPAQUE_TYPE(WindowRef) * WXWindow ;
|
typedef WX_OPAQUE_TYPE(WindowRef) * WXWindow ;
|
||||||
|
|
||||||
typedef void* WXDisplay;
|
typedef void* WXDisplay;
|
||||||
|
|
||||||
// a few native types
|
/*
|
||||||
|
* core frameworks
|
||||||
|
*/
|
||||||
|
|
||||||
typedef const void * CFTypeRef;
|
typedef const void * CFTypeRef;
|
||||||
|
|
||||||
@ -2540,11 +2538,25 @@ DECLARE_WXMAC_OPAQUE_CGREF( CGColor );
|
|||||||
DECLARE_WXMAC_OPAQUE_CGREF( CGImage );
|
DECLARE_WXMAC_OPAQUE_CGREF( CGImage );
|
||||||
DECLARE_WXMAC_OPAQUE_CGREF( CGContext );
|
DECLARE_WXMAC_OPAQUE_CGREF( CGContext );
|
||||||
|
|
||||||
|
typedef CGColorRef WXCOLORREF;
|
||||||
|
typedef CGImageRef WXCGIMAGEREF;
|
||||||
|
typedef CGContextRef WXHDC;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* carbon
|
||||||
|
*/
|
||||||
|
|
||||||
|
typedef const struct __HIShape * HIShapeRef;
|
||||||
|
typedef struct __HIShape * HIMutableShapeRef;
|
||||||
|
|
||||||
#define DECLARE_WXMAC_OPAQUE_REF( name ) typedef struct Opaque##name* name;
|
#define DECLARE_WXMAC_OPAQUE_REF( name ) typedef struct Opaque##name* name;
|
||||||
|
|
||||||
DECLARE_WXMAC_OPAQUE_REF( PasteboardRef );
|
DECLARE_WXMAC_OPAQUE_REF( PasteboardRef );
|
||||||
DECLARE_WXMAC_OPAQUE_REF( IconRef );
|
DECLARE_WXMAC_OPAQUE_REF( IconRef );
|
||||||
|
|
||||||
|
typedef IconRef WXHICON ;
|
||||||
|
typedef HIShapeRef WXHRGN;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined( __WXCOCOA__ ) || defined(__WXMAC__)
|
#if defined( __WXCOCOA__ ) || defined(__WXMAC__)
|
||||||
|
Loading…
Reference in New Issue
Block a user