|
|
commit 71069b857068201c37ffcc2c3e799329ff29769b
Author: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Thu Sep 8 16:04:09 2022 +0200
Commit: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Thu Sep 8 16:04:09 2022 +0200
Add necessary virtual qualifier to ~Fl_Font_Descriptor() and derived.
FL/Fl_Graphics_Driver.H | 2 +-
src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H | 2 +-
src/drivers/GDI/Fl_Font.H | 2 +-
src/drivers/Quartz/Fl_Font.H | 2 +-
src/drivers/Xlib/Fl_Font.H | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git FL/Fl_Graphics_Driver.H FL/Fl_Graphics_Driver.H
index 4b9115b..eacb03a 100644
--- FL/Fl_Graphics_Driver.H
+++ FL/Fl_Graphics_Driver.H
@@ -383,7 +383,7 @@ public:
Fl_Font_Descriptor *next;
Fl_Fontsize size; /**< font size */
Fl_Font_Descriptor(const char* fontname, Fl_Fontsize size);
- FL_EXPORT ~Fl_Font_Descriptor() {}
+ virtual FL_EXPORT ~Fl_Font_Descriptor() {}
short ascent, descent;
unsigned int listbase;// base of display list, 0 = none
};
diff --git src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
index 84c2f1a..5ca8ab0 100644
--- src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
+++ src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
@@ -32,7 +32,7 @@ typedef struct _PangoFontDescription PangoFontDescription;
class Fl_Cairo_Font_Descriptor : public Fl_Font_Descriptor {
public:
Fl_Cairo_Font_Descriptor(const char* fontname, Fl_Fontsize size, PangoContext *context);
- FL_EXPORT ~Fl_Cairo_Font_Descriptor();
+ virtual FL_EXPORT ~Fl_Cairo_Font_Descriptor();
PangoFontDescription *fontref;
int **width; // array of arrays of character widths
int line_height;
diff --git src/drivers/GDI/Fl_Font.H src/drivers/GDI/Fl_Font.H
index f636bb2..d160c55 100644
--- src/drivers/GDI/Fl_Font.H
+++ src/drivers/GDI/Fl_Font.H
@@ -34,7 +34,7 @@ public:
# if HAVE_GL
char glok[64];
# endif // HAVE_GL
- FL_EXPORT ~Fl_GDI_Font_Descriptor();
+ virtual FL_EXPORT ~Fl_GDI_Font_Descriptor();
};
extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table
diff --git src/drivers/Quartz/Fl_Font.H src/drivers/Quartz/Fl_Font.H
index 5e24ce7..be571ec 100644
--- src/drivers/Quartz/Fl_Font.H
+++ src/drivers/Quartz/Fl_Font.H
@@ -29,7 +29,7 @@
class Fl_Quartz_Font_Descriptor : public Fl_Font_Descriptor {
public:
Fl_Quartz_Font_Descriptor(const char* fontname, Fl_Fontsize size);
- FL_EXPORT ~Fl_Quartz_Font_Descriptor();
+ virtual FL_EXPORT ~Fl_Quartz_Font_Descriptor();
# if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
CTFontRef fontref;
// the unicode span is divided in 512 blocks of 128 characters
diff --git src/drivers/Xlib/Fl_Font.H src/drivers/Xlib/Fl_Font.H
index a148e2b..9a5e40a 100644
--- src/drivers/Xlib/Fl_Font.H
+++ src/drivers/Xlib/Fl_Font.H
@@ -49,7 +49,7 @@ public:
char glok[64];
# endif // HAVE_GL
# endif // USE_XFT
- FL_EXPORT ~Fl_Xlib_Font_Descriptor();
+ virtual FL_EXPORT ~Fl_Xlib_Font_Descriptor();
};
//extern FL_EXPORT Fl_Font_Descriptor *fl_fontsize; // the currently selected one
[ Direct Link to Message ] | |
|
| |