Add necessary virtual qualifier to ~Fl_Font_Descriptor() and derived.

This commit is contained in:
ManoloFLTK
2022-09-08 16:04:09 +02:00
parent 13e05f4204
commit 71069b8570
5 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -383,7 +383,7 @@ public:
Fl_Font_Descriptor *next; Fl_Font_Descriptor *next;
Fl_Fontsize size; /**< font size */ Fl_Fontsize size; /**< font size */
Fl_Font_Descriptor(const char* fontname, Fl_Fontsize size); Fl_Font_Descriptor(const char* fontname, Fl_Fontsize size);
FL_EXPORT ~Fl_Font_Descriptor() {} virtual FL_EXPORT ~Fl_Font_Descriptor() {}
short ascent, descent; short ascent, descent;
unsigned int listbase;// base of display list, 0 = none unsigned int listbase;// base of display list, 0 = none
}; };
+1 -1
View File
@@ -32,7 +32,7 @@ typedef struct _PangoFontDescription PangoFontDescription;
class Fl_Cairo_Font_Descriptor : public Fl_Font_Descriptor { class Fl_Cairo_Font_Descriptor : public Fl_Font_Descriptor {
public: public:
Fl_Cairo_Font_Descriptor(const char* fontname, Fl_Fontsize size, PangoContext *context); 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; PangoFontDescription *fontref;
int **width; // array of arrays of character widths int **width; // array of arrays of character widths
int line_height; int line_height;
+1 -1
View File
@@ -34,7 +34,7 @@ public:
# if HAVE_GL # if HAVE_GL
char glok[64]; char glok[64];
# endif // HAVE_GL # 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 extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table
+1 -1
View File
@@ -29,7 +29,7 @@
class Fl_Quartz_Font_Descriptor : public Fl_Font_Descriptor { class Fl_Quartz_Font_Descriptor : public Fl_Font_Descriptor {
public: public:
Fl_Quartz_Font_Descriptor(const char* fontname, Fl_Fontsize size); 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 # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
CTFontRef fontref; CTFontRef fontref;
// the unicode span is divided in 512 blocks of 128 characters // the unicode span is divided in 512 blocks of 128 characters
+1 -1
View File
@@ -49,7 +49,7 @@ public:
char glok[64]; char glok[64];
# endif // HAVE_GL # endif // HAVE_GL
# endif // USE_XFT # 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 //extern FL_EXPORT Fl_Font_Descriptor *fl_fontsize; // the currently selected one