From 998cc6df521a115454727d1ecf6bc7d4fee96f68 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 14 Mar 2010 18:07:24 +0000 Subject: Merge of branch-1.3-Fl_Printer, with the following main changes: (1) adding Fl_Device class (and more) for device abstraction (2) adding Fl_Pinter class (and more) for printing support. Todo: Code cleanup, update dependencies, remove/replace test print window. I'm looking into converting the test window popup in a global shortcut that would pop up the print dialog now... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7263 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/mac.H | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'FL/mac.H') diff --git a/FL/mac.H b/FL/mac.H index 97fa20d77..05366c23a 100644 --- a/FL/mac.H +++ b/FL/mac.H @@ -73,19 +73,19 @@ struct XPoint { int x, y; }; struct XRectangle {int x, y, width, height;}; #ifdef __APPLE_COCOA__ -// necessary so a CGRect matches exactly what is denoted x,y,w,h for clipping purposes -#define FL_CGRECTMAKE_COCOA(x,y,w,h) CGRectMake(x, y, w > 0 ? w - 0.9 : 0, h > 0 ? h - 0.9 : 0) typedef void *Window; // this is really a pter to the subclass FLWindow of NSWindow typedef struct flCocoaRegion { int count; CGRect *rects; } *Fl_Region; // a region is the union of a series of rectangles +extern CGRect fl_cgrectmake_cocoa(int x, int y, int w, int h); + inline Fl_Region XRectangleRegion(int x, int y, int w, int h) { Fl_Region R = (Fl_Region)malloc(sizeof(*R)); R->count = 1; R->rects = (CGRect *)malloc(sizeof(CGRect)); - *(R->rects) = FL_CGRECTMAKE_COCOA(x, y, w, h); + *(R->rects) = fl_cgrectmake_cocoa(x, y, w, h); return R; } inline void XDestroyRegion(Fl_Region r) { -- cgit v1.2.3