From 868ab9696fb51628afac1ea10f7df6a27907a089 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Tue, 14 Feb 2023 11:52:21 +0100 Subject: Rename class Fl_Display_Cairo_Graphics_Driver to Fl_X11_Cairo_Graphics_Driver --- src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx | 10 +++++----- src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/drivers/Xlib') diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx index e4bbe29ef..014314def 100644 --- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx @@ -1,7 +1,7 @@ // // Copy-to-clipboard code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2018 by Bill Spitzak and others. +// Copyright 1998-2023 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -22,7 +22,7 @@ #include "../X11/Fl_X11_Screen_Driver.H" #if FLTK_USE_CAIRO # include -# include "../Cairo/Fl_Display_Cairo_Graphics_Driver.H" +# include "../Cairo/Fl_X11_Cairo_Graphics_Driver.H" # include #else # include "Fl_Xlib_Graphics_Driver.H" @@ -32,7 +32,7 @@ Fl_Xlib_Copy_Surface_Driver::Fl_Xlib_Copy_Surface_Driver(int w, int h) : Fl_Copy_Surface_Driver(w, h) { #if FLTK_USE_CAIRO - driver(new Fl_Display_Cairo_Graphics_Driver()); + driver(new Fl_X11_Cairo_Graphics_Driver()); #else driver(new Fl_Xlib_Graphics_Driver()); #endif @@ -46,7 +46,7 @@ Fl_Xlib_Copy_Surface_Driver::Fl_Xlib_Copy_Surface_Driver(int w, int h) : Fl_Copy cairo_surface_destroy(surf); cairo_scale(cairo_, 1/s, 1/s); cairo_save(cairo_); - ((Fl_Display_Cairo_Graphics_Driver*)driver())->set_cairo(cairo_); + ((Fl_X11_Cairo_Graphics_Driver*)driver())->set_cairo(cairo_); #endif driver()->push_no_clip(); fl_window = xid; @@ -78,7 +78,7 @@ void Fl_Xlib_Copy_Surface_Driver::set_current() { oldwindow = fl_window; fl_window = xid; #if FLTK_USE_CAIRO - ((Fl_Display_Cairo_Graphics_Driver*)driver())->set_cairo(cairo_); + ((Fl_X11_Cairo_Graphics_Driver*)driver())->set_cairo(cairo_); #endif } diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx index 240ced649..bcaf7d46a 100644 --- a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx @@ -1,7 +1,7 @@ // // Draw-to-image code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2018 by Bill Spitzak and others. +// Copyright 1998-2023 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -19,7 +19,7 @@ #include "../../Fl_Screen_Driver.H" #if FLTK_USE_CAIRO # include -# include "../Cairo/Fl_Display_Cairo_Graphics_Driver.H" +# include "../Cairo/Fl_X11_Cairo_Graphics_Driver.H" #else # include "Fl_Xlib_Graphics_Driver.H" #endif // FLTK_USE_CAIRO @@ -38,12 +38,12 @@ Fl_Xlib_Image_Surface_Driver::Fl_Xlib_Image_Surface_Driver(int w, int h, int hig offscreen = (Fl_Offscreen)XCreatePixmap(fl_display, RootWindow(fl_display, fl_screen), w, h, fl_visual->depth); } #if FLTK_USE_CAIRO - driver(new Fl_Display_Cairo_Graphics_Driver()); + driver(new Fl_X11_Cairo_Graphics_Driver()); cairo_surface_t *s = cairo_xlib_surface_create(fl_display, offscreen, fl_visual->visual, w, h); cairo_ = cairo_create(s); cairo_surface_destroy(s); cairo_save(cairo_); - ((Fl_Display_Cairo_Graphics_Driver*)driver())->set_cairo(cairo_); + ((Fl_X11_Cairo_Graphics_Driver*)driver())->set_cairo(cairo_); #else driver(new Fl_Xlib_Graphics_Driver()); #endif @@ -63,7 +63,7 @@ void Fl_Xlib_Image_Surface_Driver::set_current() { pre_window = fl_window; fl_window = offscreen; #if FLTK_USE_CAIRO - ((Fl_Display_Cairo_Graphics_Driver*)driver())->set_cairo(cairo_); + ((Fl_X11_Cairo_Graphics_Driver*)driver())->set_cairo(cairo_); #endif } -- cgit v1.2.3