From 0d6d012936a26f67855d5f3d2238579d33f244d5 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 15 Jul 2014 17:14:21 +0000 Subject: [PATCH] common type for native rectangle git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/cocoa/private.h | 4 +++- include/wx/osx/iphone/private.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index 3b99f4e24e..7d36a1e6c6 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -293,6 +293,8 @@ public: }; #ifdef __OBJC__ + + typedef NSRect WXRect; typedef void (*wxOSX_TextEventHandlerPtr)(NSView* self, SEL _cmd, NSString *event); typedef void (*wxOSX_EventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event); typedef BOOL (*wxOSX_PerformKeyEventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event); @@ -477,7 +479,7 @@ extern ClassicCursor gMacCursors[]; extern NSLayoutManager* gNSLayoutManager; -#endif +#endif // wxUSE_GUI #endif // _WX_PRIVATE_COCOA_H_ diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h index 1b7c30f94a..1550eb8765 100644 --- a/include/wx/osx/iphone/private.h +++ b/include/wx/osx/iphone/private.h @@ -24,6 +24,8 @@ #if wxUSE_GUI +typedef CGRect WXRect; + OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage( CGContextRef inContext, const CGRect * inBounds,