From 8e3f66073f8e30e874eb3e6cf76ab0a614c39aad Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Wed, 27 Jan 2016 18:11:20 +0000 Subject: 1) Added a new way to detect whether the drawing operation is using the platform's native driver and whether we are printing: virtual int Fl_Graphics_Driver::has_feature(driver_feature feature) This is also because it is not convenient to derive a printer-specific driver with its own implementation of virtual functions when this implementation differs only in one line of code. 2) Solved the problem of inclusion of non public header by the public header FL/Fl_Device.H: bracket this with #if FL_LIBRARY / #endif so this non public header is included only when building FLTK itself. 3) Removed several (but not all) of the FLTK_ABI_VERSION guards that are no longer useful for code targeting FLTK 1.4. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11063 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Double_Window.cxx | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'src/Fl_Double_Window.cxx') diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx index 559056a46..b3b82d851 100644 --- a/src/Fl_Double_Window.cxx +++ b/src/Fl_Double_Window.cxx @@ -90,33 +90,9 @@ void Fl_Double_Window::show() { \param pixmap offscreen buffer containing the rectangle to copy \param srcx,srcy origin in offscreen buffer of rectangle to copy */ -#if FLTK_ABI_VERSION >= 10301 void fl_copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) { fl_graphics_driver->copy_offscreen(x, y, w, h, pixmap, srcx, srcy); } -#else -void fl_copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx, int srcy) { -#ifdef WIN32 - if (fl_graphics_driver->class_name() == Fl_GDI_Graphics_Driver::class_id || - fl_graphics_driver->class_name() == Fl_GDI_Printer_Graphics_Driver::class_id) { -#else - if (fl_graphics_driver->class_name() == Fl_Display_Device::display_device()->driver()->class_name()) { -#endif -#ifdef USE_X11 - ((Fl_Xlib_Graphics_Driver*)fl_graphics_driver)->copy_offscreen(x, y, w, h, pixmap, srcx, srcy); -#elif defined(WIN32) - ((Fl_GDI_Graphics_Driver*)fl_graphics_driver)->copy_offscreen(x, y, w, h, pixmap, srcx, srcy); -#elif defined(__APPLE__) - ((Fl_Quartz_Graphics_Driver*)fl_graphics_driver)->copy_offscreen(x, y, w, h, pixmap, srcx, srcy); -#elif defined(FL_PORTING) -# pragma message "FL_PORTING: call your version of fl_copy_offscreen here" -#endif - } - else { // when copy is not to the display - fl_graphics_driver->copy_offscreen(x, y, w, h, pixmap, srcx, srcy); - } -} -#endif // FLTK_ABI_VERSION /** @} */ /** see fl_copy_offscreen() */ -- cgit v1.2.3