From f4ef4722ac03de4c4695a1d464a9cb4a1acb95ea Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 1 Sep 2008 07:17:20 +0000 Subject: [PATCH] more common osx types git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 9ed2232e6a..41b87639d5 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -2693,7 +2693,6 @@ typedef void* WXEVENTREF; typedef void* WXEVENTHANDLERREF; typedef void* WXEVENTHANDLERCALLREF; typedef void* WXAPPLEEVENTREF; -typedef void* WXHMENU; typedef unsigned int WXUINT; typedef unsigned long WXDWORD; @@ -2703,6 +2702,8 @@ typedef WX_OPAQUE_TYPE(PicHandle ) * WXHMETAFILE ; #if wxOSX_USE_CARBON typedef WX_OPAQUE_TYPE(ControlRef ) * WXWidget ; typedef WX_OPAQUE_TYPE(WindowRef) * WXWindow ; +typedef struct __AGLPixelFormatRec *WXGLPixelFormat; +typedef struct __AGLContextRec *WXGLContext; #endif typedef void* WXDisplay; @@ -2739,9 +2740,13 @@ typedef struct __HIShape * HIMutableShapeRef; DECLARE_WXMAC_OPAQUE_REF( PasteboardRef ) DECLARE_WXMAC_OPAQUE_REF( IconRef ) +DECLARE_WXMAC_OPAQUE_REF( MenuRef ) typedef IconRef WXHICON ; typedef HIShapeRef WXHRGN; +#if wxOSX_USE_CARBON +typedef MenuRef WXHMENU; +#endif #endif @@ -2840,6 +2845,8 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSTextStorage); DECLARE_WXCOCOA_OBJC_CLASS(NSThread); DECLARE_WXCOCOA_OBJC_CLASS(NSWindow); DECLARE_WXCOCOA_OBJC_CLASS(NSView); +DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLContext); +DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLPixelFormat); #ifndef __WXMAC__ typedef WX_NSView WXWidget; /* wxWidgets BASE definition */ #endif @@ -2853,6 +2860,9 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSString); typedef WX_NSWindow WXWindow; typedef WX_NSView WXWidget; +typedef WX_NSMenu WXHMENU; +typedef WX_NSOpenGLPixelFormat WXGLPixelFormat; +typedef WX_NSOpenGLContext WXGLContext; #elif wxOSX_USE_IPHONE -- 2.47.2