From e543d2c7635affb4e167659c2108b918752997aa Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Tue, 7 Jan 2014 15:31:28 +0000 Subject: Cleaner definition under Mac OS of the fl_default_cursor global variable that doesn't hide its type. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10048 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/mac.H | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'FL') diff --git a/FL/mac.H b/FL/mac.H index 6450aba83..2bd340400 100644 --- a/FL/mac.H +++ b/FL/mac.H @@ -49,6 +49,12 @@ typedef CGContextRef Fl_Offscreen; #include #undef check // because of Fl::check() +#ifdef __OBJC__ +@class NSCursor; +#else +class NSCursor; +#endif // __OBJC__ + typedef CGContextRef Fl_Offscreen; typedef struct flCocoaRegion { @@ -84,7 +90,7 @@ inline void XDestroyRegion(Fl_Region r) { free(r); } } -extern void *fl_default_cursor; +extern NSCursor *fl_default_cursor; // This object contains all mac-specific stuff about a window: // WARNING: this object is highly subject to change! @@ -99,7 +105,7 @@ public: Fl_X *next; // linked tree to support subwindows Fl_X *xidChildren, *xidNext; // more subwindow tree int wait_for_expose; - void *cursor; // is really NSCursor* + NSCursor *cursor; static Fl_X* first; static Fl_X* i(const Fl_Window* w) {return w->i;} static int fake_X_wm(const Fl_Window*,int&,int&,int&,int&,int&); -- cgit v1.2.3