diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2021-03-26 07:52:21 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2021-03-26 07:52:21 +0100 |
| commit | 4657e988f7e351020876172218a5534e739bd18e (patch) | |
| tree | 8f7f314864e750194344e01a862e53730bb7db68 /src/drivers | |
| parent | 4951fd1801e94915e462c0fa96765f8ee2187b16 (diff) | |
Remove X11-specific code from platform-independent Fl_PostScript.cxx
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H | 1 | ||||
| -rw-r--r-- | src/drivers/PostScript/Fl_PostScript.cxx | 3 | ||||
| -rw-r--r-- | src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H index bbcb4144a..a0ded9b30 100644 --- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H +++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H @@ -46,7 +46,6 @@ public: int pages_; cairo_t *cr() { return cairo_; } PangoLayout *pango_layout() {return pango_layout_;}; - virtual PangoFontDescription* pango_font_description(Fl_Font fnum) { return NULL; } void check_status(void); diff --git a/src/drivers/PostScript/Fl_PostScript.cxx b/src/drivers/PostScript/Fl_PostScript.cxx index c041923d2..470f6df83 100644 --- a/src/drivers/PostScript/Fl_PostScript.cxx +++ b/src/drivers/PostScript/Fl_PostScript.cxx @@ -32,7 +32,6 @@ #include <FL/math.h> // for M_PI #include <pango/pangocairo.h> #include <cairo/cairo-ps.h> -#include "../Xlib/Fl_Xlib_Graphics_Driver.H" #endif const char *Fl_PostScript_File_Device::file_chooser_title = "Select a .ps file"; @@ -1503,7 +1502,7 @@ int Fl_PostScript_Graphics_Driver::start_eps(int width, int height) { } PangoFontDescription* Fl_PostScript_Graphics_Driver::pango_font_description(Fl_Font fnum) { - return Fl_Xlib_Graphics_Driver::pango_font_description(fnum); + return Fl_Graphics_Driver::default_driver().pango_font_description(fnum); } #endif // USE_PANGO diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H index e4a35306b..bae7640be 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H @@ -85,7 +85,7 @@ protected: static PangoFontMap *pfmap_; static PangoLayout *playout_; public: - static PangoFontDescription* pango_font_description(Fl_Font fnum) { return pfd_array[fnum]; } + virtual PangoFontDescription* pango_font_description(Fl_Font fnum) { return pfd_array[fnum]; } private: static PangoFontDescription **pfd_array; // one array element for each Fl_Font static int pfd_array_length; |