summaryrefslogtreecommitdiff
path: root/src/Fl_mac.cxx
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2006-06-04 10:21:45 +0000
committerMatthias Melcher <fltk@matthiasm.com>2006-06-04 10:21:45 +0000
commit60ece00315eb46a6d4b42bc4243097e8d0c9bcc3 (patch)
treed77f080665c0ed9d98d403af6c78802fcba81588 /src/Fl_mac.cxx
parentc4b8afdcf9b9c8cca1eab0eb25fdfc508e7e6852 (diff)
OS X Quartz: one pretty essential fix to the call order in Quartz context change which fixed a lot of warnings. I also added a file that helps tremondously to debug Core Graphics calls. This file is not compiled into the source tree by default, but the annotations in "src/cgdebug.h" explain the usage.
In regard to CG Text drawing vs. the new ATSU Text drawing: I now remember why I did not ATSU in the beginning: STDU does not use the CG clipping area or text pen settings. So, if you plan on using the current SVN with --enable-quartz, please be aware that you will not have any text clipping or any other text color than black. Finally, I added code to FLTK on OS X that retreives the selection color from the system instead of assuming dark blue. I am not entirely confident about this change as it may require OS X 10.4 . Feedback appreciiated. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5173 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_mac.cxx')
-rw-r--r--src/Fl_mac.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx
index a73c493ea..5a7db50ac 100644
--- a/src/Fl_mac.cxx
+++ b/src/Fl_mac.cxx
@@ -2066,15 +2066,15 @@ void Fl_Window::make_current()
DiffRgn( fl_window_region, r, fl_window_region );
DisposeRgn( r );
}
-
- fl_clip_region( 0 );
- SetPortClipRegion( GetWindowPort(i->xid), fl_window_region );
+
#ifdef __APPLE_QUARTZ__
QDBeginCGContext(GetWindowPort(i->xid), &i->gc);
fl_gc = i->gc;
CGContextSaveGState(fl_gc);
Fl_X::q_fill_context();
#endif
+ fl_clip_region( 0 );
+ SetPortClipRegion( GetWindowPort(i->xid), fl_window_region );
return;
}