Author: manolo
Date: 2012-05-21 07:44:44 -0700 (Mon, 21 May 2012)
New Revision: 9541
Log:
Fixed fltk3::GraphicsDriver_I::pop_clip() for FLTK1 compatibility with
Fl_Graphics_Driver.
Modified:
branches/branch-3.0/include/FL/Fl_Device.H
branches/branch-3.0/include/fltk3/Wrapper.h
Modified: branches/branch-3.0/include/FL/Fl_Device.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Device.H 2012-05-21 09:56:45 UTC (rev
9540)
+++ branches/branch-3.0/include/FL/Fl_Device.H 2012-05-21 14:44:44 UTC (rev
9541)
@@ -278,7 +278,13 @@
pWrapper->pVCalls &= ~Wrapper::pVCallGraphicsPushClip;
}
}
- FLTK3_DRIVER_VF(pop_clip(), pop_clip())
+ void pop_clip() {
+ if (pWrapper && !(pWrapper->pVCalls & Wrapper::pVCallGraphicsPopClip) ) {
+ pWrapper->pVCalls |= Wrapper::pVCallGraphicsPopClip;
+ ((GraphicsDriverWrapper*)pWrapper)->pop_clip();
+ pWrapper->pVCalls &= ~Wrapper::pVCallGraphicsPopClip;
+ }
+ }
FLTK3_DRIVER_VF1(line(int x, int y, int x1, int y1, int x2, int y2),
line(x+origin_x(), y+origin_y(), x1+origin_x(), y1+origin_y(), x2+origin_x(),
y2+origin_y()))
FLTK3_DRIVER_VF1(xyline(int x, int y, int x1), xyline(x+origin_x(),
y+origin_y(), x1+origin_x()))
FLTK3_DRIVER_VF1(xyline(int x, int y, int x1, int y2), xyline(x+origin_x(),
y+origin_y(), x1+origin_x(), y2+origin_y()))
Modified: branches/branch-3.0/include/fltk3/Wrapper.h
===================================================================
--- branches/branch-3.0/include/fltk3/Wrapper.h 2012-05-21 09:56:45 UTC (rev
9540)
+++ branches/branch-3.0/include/fltk3/Wrapper.h 2012-05-21 14:44:44 UTC (rev
9541)
@@ -411,7 +411,8 @@
pVCallGraphicsDriver = 1<<1,
pVCallGraphicsDrawImage = 1<<2,
pVCallGraphicsEndLine = 1<<3,
- pVCallGraphicsPushClip = 1<<4
+ pVCallGraphicsPushClip = 1<<4,
+ pVCallGraphicsPopClip = 1<<5
};
};
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
