mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Fl_X::q_clear_clipping() used only once.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11170 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-02-14 06:19:26 +00:00
parent a349dc994e
commit 6439f34ee7
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FL/mac.H
View File

@ -163,7 +163,6 @@ public:
// Quartz additions:
CGContextRef gc; // graphics context (NULL when using QD)
static void q_fill_context(); // fill a Quartz context with current FLTK state
static void q_clear_clipping(); // remove all clipping from a Quartz context
static void q_release_context(Fl_X *x=0); // free all resources associated with fl_gc
// Cocoa additions
static NSOpenGLPixelFormat *mode_to_NSOpenGLPixelFormat(int mode, const int*); // computes NSOpenGLPixelFormat from Gl window's mode

3
FL/porting.H
View File

@ -98,10 +98,7 @@ public:
// // Quartz additions:
// CGContextRef gc; // graphics context (NULL when using QD)
// static void q_fill_context(); // fill a Quartz context with current FLTK state
// static void q_clear_clipping(); // remove all clipping from a Quartz context
// static void q_release_context(Fl_X *x=0); // free all resources associated with fl_gc
// static void q_begin_image(CGRect&, int x, int y, int w, int h);
// static void q_end_image();
// // Cocoa additions
// static NSOpenGLPixelFormat *mode_to_NSOpenGLPixelFormat(int mode, const int*); // computes NSOpenGLPixelFormat from Gl window's mode
// static NSOpenGLContext* create_GLcontext_for_window(NSOpenGLPixelFormat *pixelformat, NSOpenGLContext *shared_ctx, Fl_Window *window);

8
src/Fl_cocoa.mm
View File

@ -3325,14 +3325,6 @@ void Fl_X::q_fill_context() {
fl_quartz_restore_line_style_();
}
// The only way to reset clipping to its original state is to pop the current graphics
// state and restore the global state.
void Fl_X::q_clear_clipping() {
if (!fl_gc) return;
CGContextRestoreGState(fl_gc);
CGContextSaveGState(fl_gc);
}
// Give the Quartz context back to the system
void Fl_X::q_release_context(Fl_X *x) {
if (x && x->gc!=fl_gc) return;

5
src/drivers/Quartz/Fl_Quartz_Graphics_Driver_rect.cxx
View File

@ -269,7 +269,10 @@ void Fl_Quartz_Graphics_Driver::restore_clip() {
fl_clip_state_number++;
Fl_Region r = rstack[rstackptr];
if ( fl_window || fl_gc ) { // clipping for a true window or an offscreen buffer
Fl_X::q_clear_clipping();
if (fl_gc) {
CGContextRestoreGState(fl_gc);
CGContextSaveGState(fl_gc);
}
Fl_X::q_fill_context();//flip coords if bitmap context
//apply program clip
if (r) {