gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix several compiler warnings [-Wextra-semi]

Browse Source 
Example:
  warning: extra ‘;’ after in-class function definition [-Wextra-semi]

Also: replace 'FL_OVERRIDE' with 'override' in all modified files
This commit is contained in:
Albrecht Schlosser 2025-05-30 16:06:56 +02:00
parent 2d2f474794
commit 7897bbc04f
5 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
FL/Fl_PDF_File_Surface.H
View File

@ -1,7 +1,7 @@
//
// Declaration of class Fl_PDF_File_Surface for the Fast Light Tool Kit (FLTK).
//
// Copyright 2024 by Bill Spitzak and others.
// Copyright 2024-2025 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
@ -54,7 +54,7 @@ public:
*/
int begin_job(const char* defaultfilename, char **perr = NULL);
/** Don't use for this class */
int begin_job(int, int *, int *, char **) FL_OVERRIDE {return 1;}
int begin_job(int, int *, int *, char **) override {return 1;}
/** Prepare to draw to a PDF document identified by its pathname.
\param pathname Path name for the PDF document
\param format The paper format for the PDF document
@ -67,23 +67,23 @@ public:
enum Fl_Paged_Device::Page_Format format = Fl_Paged_Device::A4,
enum Fl_Paged_Device::Page_Layout layout = Fl_Paged_Device::PORTRAIT,
char **perr = NULL);
int printable_rect(int *w, int *h) FL_OVERRIDE { return platform_surface_->printable_rect(w,h); }
void margins(int *left, int *top, int *right, int *bottom) FL_OVERRIDE {
int printable_rect(int *w, int *h) override { return platform_surface_->printable_rect(w,h); }
void margins(int *left, int *top, int *right, int *bottom) override {
platform_surface_->margins(left,top,right,bottom);
}
void origin(int x, int y) FL_OVERRIDE {platform_surface_->origin(x, y);}
void origin(int *x, int *y) FL_OVERRIDE {platform_surface_->origin(x, y);}
void scale(float s_x, float s_y = 0) FL_OVERRIDE {platform_surface_->scale(s_x, s_y);}
void rotate(float angle) FL_OVERRIDE {platform_surface_->rotate(angle);}
void translate(int x, int y) FL_OVERRIDE {platform_surface_->translate(x, y);}
void untranslate() FL_OVERRIDE {platform_surface_->untranslate();};
int begin_page(void) FL_OVERRIDE {return platform_surface_->begin_page();}
int end_page(void) FL_OVERRIDE {return platform_surface_->end_page();}
void end_job(void) FL_OVERRIDE {return platform_surface_->end_job();}
void origin(int x, int y) override {platform_surface_->origin(x, y);}
void origin(int *x, int *y) override {platform_surface_->origin(x, y);}
void scale(float s_x, float s_y = 0) override {platform_surface_->scale(s_x, s_y);}
void rotate(float angle) override {platform_surface_->rotate(angle);}
void translate(int x, int y) override {platform_surface_->translate(x, y);}
void untranslate() override {platform_surface_->untranslate();}
int begin_page(void) override {return platform_surface_->begin_page();}
int end_page(void) override {return platform_surface_->end_page();}
void end_job(void) override {return platform_surface_->end_job();}
/** Returns the name of the PDF document */
inline const char *pdf_filename() { return *out_filename_; }
void set_current() FL_OVERRIDE { if (platform_surface_) platform_surface_->set_current(); }
bool is_current() FL_OVERRIDE { return surface() == platform_surface_; }
void set_current() override { if (platform_surface_) platform_surface_->set_current(); }
bool is_current() override { return surface() == platform_surface_; }
};
#endif // PDF_FILE_SURFACE_H

90
FL/fl_callback_macros.H
View File

@ -1,7 +1,7 @@
/*
* Macros for easy callbacks for the Fast Light Tool Kit (FLTK).
*
* Copyright 2023 by Bill Spitzak and others.
* Copyright 2023-2025 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
@ -211,7 +211,7 @@
static void cb(Fl_Widget *w, void *user_data) {
Fl_Callback_User_Data_92 *d = (Fl_Callback_User_Data_92*)user_data;
hello_2_args_cb(d->p0_, d->p1_);
};
}
Fl_Callback_User_Data_92(const char * p0, int p1)
: p0_(p0),
p1_(p1)
@ -235,9 +235,9 @@
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
FUNC(d->p0_, d->p1_, d->p2_, d->p3_, d->p4_); \
}; \
} \
_FL_CBD_CLASS_NAME(TYPE0 p0, TYPE1 p1, TYPE2 p2, TYPE3 p3, TYPE4 p4) \
: p0_(p0), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { }; \
: p0_(p0), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(VALUE0, VALUE1, VALUE2, VALUE3, VALUE4), true); \
} while(0)
@ -250,9 +250,9 @@
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
FUNC(d->p0_, d->p1_, d->p2_, d->p3_); \
}; \
} \
_FL_CBD_CLASS_NAME(TYPE0 p0, TYPE1 p1, TYPE2 p2, TYPE3 p3) \
: p0_(p0), p1_(p1), p2_(p2), p3_(p3) { }; \
: p0_(p0), p1_(p1), p2_(p2), p3_(p3) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(VALUE0, VALUE1, VALUE2, VALUE3), true); \
} while(0)
@ -265,9 +265,9 @@
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
FUNC(d->p0_, d->p1_, d->p2_); \
}; \
} \
_FL_CBD_CLASS_NAME(TYPE0 p0, TYPE1 p1, TYPE2 p2) \
: p0_(p0), p1_(p1), p2_(p2) { }; \
: p0_(p0), p1_(p1), p2_(p2) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(VALUE0, VALUE1, VALUE2), true); \
} while(0)
@ -280,9 +280,9 @@
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
FUNC(d->p0_, d->p1_); \
}; \
} \
_FL_CBD_CLASS_NAME(TYPE0 p0, TYPE1 p1) \
: p0_(p0), p1_(p1) { }; \
: p0_(p0), p1_(p1) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(VALUE0, VALUE1), true); \
} while(0)
@ -308,8 +308,8 @@
public: \
static void cb(Fl_Widget *w, void *user_data) { \
FUNC(); \
}; \
_FL_CBD_CLASS_NAME() { }; \
} \
_FL_CBD_CLASS_NAME() { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(), true); \
} while(0)
@ -341,7 +341,7 @@
static void cb(Fl_Widget *w, void *user_data) {
Fl_Callback_User_Data_73 *d = (Fl_Callback_User_Data_73*)user_data;
d->self_->resize(d->p0_, d->p1_, d->p2_, d->p3_);
};
}
Fl_Callback_User_Data_73(MyWindow *self, int p0, int p1, int p2, int p3)
: self_(self), p0_(p0), p1_(p1), p2_(p2), p3_(p3) { }
};
@ -366,9 +366,9 @@
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
d->self_->METHOD(d->p0_, d->p1_, d->p2_, d->p3_, d->p4_); \
}; \
} \
_FL_CBD_CLASS_NAME(CLASS *self, TYPE0 p0, TYPE1 p1, TYPE2 p2, TYPE3 p3, TYPE4 p4) \
: self_(self), p0_(p0), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { }; \
: self_(self), p0_(p0), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(SELF, VALUE0, VALUE1, VALUE2, VALUE3, VALUE4), true); \
} while(0)
@ -382,9 +382,9 @@
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
d->self_->METHOD(d->p0_, d->p1_, d->p2_, d->p3_); \
}; \
} \
_FL_CBD_CLASS_NAME(CLASS *self, TYPE0 p0, TYPE1 p1, TYPE2 p2, TYPE3 p3) \
: self_(self), p0_(p0), p1_(p1), p2_(p2), p3_(p3) { }; \
: self_(self), p0_(p0), p1_(p1), p2_(p2), p3_(p3) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(SELF, VALUE0, VALUE1, VALUE2, VALUE3), true); \
} while(0)
@ -398,9 +398,9 @@
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
d->self_->METHOD(d->p0_, d->p1_, d->p2_); \
}; \
} \
_FL_CBD_CLASS_NAME(CLASS *self, TYPE0 p0, TYPE1 p1, TYPE2 p2) \
: self_(self), p0_(p0), p1_(p1), p2_(p2) { }; \
: self_(self), p0_(p0), p1_(p1), p2_(p2) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(SELF, VALUE0, VALUE1, VALUE2), true); \
} while(0)
@ -414,9 +414,9 @@
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
d->self_->METHOD(d->p0_, d->p1_); \
}; \
} \
_FL_CBD_CLASS_NAME(CLASS *self, TYPE0 p0, TYPE1 p1) \
: self_(self), p0_(p0), p1_(p1) { }; \
: self_(self), p0_(p0), p1_(p1) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(SELF, VALUE0, VALUE1), true); \
} while(0)
@ -430,9 +430,9 @@
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
d->self_->METHOD(d->p0_); \
}; \
} \
_FL_CBD_CLASS_NAME(CLASS *self, TYPE0 p0) \
: self_(self), p0_(p0) { }; \
: self_(self), p0_(p0) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(SELF, VALUE0), true); \
} while(0)
@ -445,9 +445,9 @@
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
d->self_->METHOD(); \
}; \
} \
_FL_CBD_CLASS_NAME(CLASS *self) \
: self_(self) { }; \
: self_(self) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(SELF), true); \
} while(0)
@ -478,12 +478,12 @@
// lambda style function
static void fn(const char * text, int number ) {
fl_message("We received the message %s with %d!", text, number);
};
}
// FLTK style callback
static void cb(Fl_Widget *w, void *user_data) {
Fl_Callback_User_Data_133 *d = (Fl_Callback_User_Data_133*)user_data;
fn(d->p0_, d->p1_);
};
}
// class constructor
Fl_Callback_User_Data_133(const char * p0, int p1)
: p0_(p0), // copy parameter 0
@ -509,13 +509,13 @@
public: \
TYPE0 p0_; TYPE1 p1_; TYPE2 p2_; TYPE3 p3_; TYPE4 p4_; \
static void fn(TYPE0 NAME0, TYPE1 NAME1, TYPE2 NAME2, TYPE3 NAME3, TYPE4 NAME4) \
LAMBDA; \
LAMBDA \
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
_FL_CBD_CLASS_NAME::fn(d->p0_, d->p1_, d->p2_, d->p3_, d->p4_); \
}; \
} \
_FL_CBD_CLASS_NAME(TYPE0 p0, TYPE1 p1, TYPE2 p2, TYPE3 p3, TYPE4 p4) \
: p0_(p0), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { }; \
: p0_(p0), p1_(p1), p2_(p2), p3_(p3), p4_(p4) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(VALUE0, VALUE1, VALUE2, VALUE3, VALUE4), true); \
} while(0)
@ -526,13 +526,13 @@
public: \
TYPE0 p0_; TYPE1 p1_; TYPE2 p2_; TYPE3 p3_; \
static void fn(TYPE0 NAME0, TYPE1 NAME1, TYPE2 NAME2, TYPE3 NAME3) \
LAMBDA; \
LAMBDA \
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
_FL_CBD_CLASS_NAME::fn(d->p0_, d->p1_, d->p2_, d->p3_); \
}; \
} \
_FL_CBD_CLASS_NAME(TYPE0 p0, TYPE1 p1, TYPE2 p2, TYPE3 p3) \
: p0_(p0), p1_(p1), p2_(p2), p3_(p3) { }; \
: p0_(p0), p1_(p1), p2_(p2), p3_(p3) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(VALUE0, VALUE1, VALUE2, VALUE3), true); \
} while(0)
@ -543,13 +543,13 @@
public: \
TYPE0 p0_; TYPE1 p1_; TYPE2 p2_; \
static void fn(TYPE0 NAME0, TYPE1 NAME1, TYPE2 NAME2) \
LAMBDA; \
LAMBDA \
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
_FL_CBD_CLASS_NAME::fn(d->p0_, d->p1_, d->p2_); \
}; \
} \
_FL_CBD_CLASS_NAME(TYPE0 p0, TYPE1 p1, TYPE2 p2) \
: p0_(p0), p1_(p1), p2_(p2) { }; \
: p0_(p0), p1_(p1), p2_(p2) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(VALUE0, VALUE1, VALUE2), true); \
} while(0)
@ -560,13 +560,13 @@
public: \
TYPE0 p0_; TYPE1 p1_; \
static void fn(TYPE0 NAME0, TYPE1 NAME1) \
LAMBDA; \
LAMBDA \
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
_FL_CBD_CLASS_NAME::fn(d->p0_, d->p1_); \
}; \
} \
_FL_CBD_CLASS_NAME(TYPE0 p0, TYPE1 p1) \
: p0_(p0), p1_(p1) { }; \
: p0_(p0), p1_(p1) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(VALUE0, VALUE1), true); \
} while(0)
@ -577,13 +577,13 @@
public: \
TYPE0 p0_; \
static void fn(TYPE0 NAME0) \
LAMBDA; \
LAMBDA \
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME *d = (_FL_CBD_CLASS_NAME*)user_data; \
_FL_CBD_CLASS_NAME::fn(d->p0_); \
}; \
} \
_FL_CBD_CLASS_NAME(TYPE0 p0) \
: p0_(p0) { }; \
: p0_(p0) { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(VALUE0), true); \
} while(0)
@ -593,11 +593,11 @@
class _FL_CBD_CLASS_NAME : public Fl_Callback_User_Data { \
public: \
static void fn() \
LAMBDA; \
LAMBDA \
static void cb(Fl_Widget *w, void *user_data) { \
_FL_CBD_CLASS_NAME::fn(); \
}; \
_FL_CBD_CLASS_NAME() { }; \
} \
_FL_CBD_CLASS_NAME() { } \
}; \
WIDGET->callback(_FL_CBD_CLASS_NAME::cb, new _FL_CBD_CLASS_NAME(), true); \
} while(0)

56
fluid/app/Snap_Action.cxx
View File

@ -1164,7 +1164,7 @@ public:
class Fd_Snap_Left_Window_Edge : public Fd_Snap_Left {
public:
void check(Snap_Data &d) override { clr(); check_x_(d, d.bx, 0); }
void draw(Snap_Data &d) override { draw_left_brace(d.win->o); };
void draw(Snap_Data &d) override { draw_left_brace(d.win->o); }
};
Fd_Snap_Left_Window_Edge snap_left_window_edge;
@ -1174,7 +1174,7 @@ Fd_Snap_Left_Window_Edge snap_left_window_edge;
class Fd_Snap_Right_Window_Edge : public Fd_Snap_Right {
public:
void check(Snap_Data &d) override { clr(); check_x_(d, d.br, d.win->o->w()); }
void draw(Snap_Data &d) override { draw_right_brace(d.win->o); };
void draw(Snap_Data &d) override { draw_right_brace(d.win->o); }
};
Fd_Snap_Right_Window_Edge snap_right_window_edge;
@ -1184,7 +1184,7 @@ Fd_Snap_Right_Window_Edge snap_right_window_edge;
class Fd_Snap_Top_Window_Edge : public Fd_Snap_Top {
public:
void check(Snap_Data &d) override { clr(); check_y_(d, d.by, 0); }
void draw(Snap_Data &d) override { draw_top_brace(d.win->o); };
void draw(Snap_Data &d) override { draw_top_brace(d.win->o); }
};
Fd_Snap_Top_Window_Edge snap_top_window_edge;
@ -1194,7 +1194,7 @@ Fd_Snap_Top_Window_Edge snap_top_window_edge;
class Fd_Snap_Bottom_Window_Edge : public Fd_Snap_Bottom {
public:
void check(Snap_Data &d) override { clr(); check_y_(d, d.bt, d.win->o->h()); }
void draw(Snap_Data &d) override { draw_bottom_brace(d.win->o); };
void draw(Snap_Data &d) override { draw_bottom_brace(d.win->o); }
};
Fd_Snap_Bottom_Window_Edge snap_bottom_window_edge;
@ -1209,7 +1209,7 @@ public:
}
void draw(Snap_Data &d) override {
draw_h_arrow(d.bx, (d.by+d.bt)/2, 0);
};
}
};
Fd_Snap_Left_Window_Margin snap_left_window_margin;
@ -1221,7 +1221,7 @@ public:
}
void draw(Snap_Data &d) override {
draw_h_arrow(d.br, (d.by+d.bt)/2, d.win->o->w()-1);
};
}
};
Fd_Snap_Right_Window_Margin snap_right_window_margin;
@ -1233,7 +1233,7 @@ public:
}
void draw(Snap_Data &d) override {
draw_v_arrow((d.bx+d.br)/2, d.by, 0);
};
}
};
Fd_Snap_Top_Window_Margin snap_top_window_margin;
@ -1245,7 +1245,7 @@ public:
}
void draw(Snap_Data &d) override {
draw_v_arrow((d.bx+d.br)/2, d.bt, d.win->o->h()-1);
};
}
};
Fd_Snap_Bottom_Window_Margin snap_bottom_window_margin;
@ -1262,7 +1262,7 @@ public:
}
void draw(Snap_Data &d) override {
draw_left_brace(parent(d));
};
}
};
Fd_Snap_Left_Group_Edge snap_left_group_edge;
@ -1274,7 +1274,7 @@ public:
}
void draw(Snap_Data &d) override {
draw_right_brace(parent(d));
};
}
};
Fd_Snap_Right_Group_Edge snap_right_group_edge;
@ -1286,7 +1286,7 @@ public:
}
void draw(Snap_Data &d) override {
draw_top_brace(parent(d));
};
}
};
Fd_Snap_Top_Group_Edge snap_top_group_edge;
@ -1298,7 +1298,7 @@ public:
}
void draw(Snap_Data &d) override {
draw_bottom_brace(parent(d));
};
}
};
Fd_Snap_Bottom_Group_Edge snap_bottom_group_edge;
@ -1315,7 +1315,7 @@ public:
void draw(Snap_Data &d) override {
draw_left_brace(parent(d));
draw_h_arrow(d.bx, (d.by+d.bt)/2, parent(d)->x());
};
}
};
Fd_Snap_Left_Group_Margin snap_left_group_margin;
@ -1328,7 +1328,7 @@ public:
void draw(Snap_Data &d) override {
draw_right_brace(parent(d));
draw_h_arrow(d.br, (d.by+d.bt)/2, parent(d)->x()+parent(d)->w()-1);
};
}
};
Fd_Snap_Right_Group_Margin snap_right_group_margin;
@ -1341,7 +1341,7 @@ public:
void draw(Snap_Data &d) override {
draw_top_brace(parent(d));
draw_v_arrow((d.bx+d.br)/2, d.by, parent(d)->y());
};
}
};
Fd_Snap_Top_Group_Margin snap_top_group_margin;
@ -1354,7 +1354,7 @@ public:
void draw(Snap_Data &d) override {
draw_bottom_brace(parent(d));
draw_v_arrow((d.bx+d.br)/2, d.bt, parent(d)->y()+parent(d)->h()-1);
};
}
};
Fd_Snap_Bottom_Group_Margin snap_bottom_group_margin;
@ -1425,7 +1425,7 @@ public:
void draw(Snap_Data &d) override {
auto layout = Fluid.proj.layout;
draw_grid(nearest_x, nearest_y, layout->window_grid_x, layout->window_grid_y);
};
}
};
Fd_Snap_Window_Grid snap_window_grid;
@ -1446,7 +1446,7 @@ public:
void draw(Snap_Data &d) override {
auto layout = Fluid.proj.layout;
draw_grid(nearest_x, nearest_y, layout->group_grid_x, layout->group_grid_y);
};
}
};
Fd_Snap_Group_Grid snap_group_grid;
@ -1500,7 +1500,7 @@ public:
}
void draw(Snap_Data &d) override {
if (best_match) draw_left_brace(best_match);
};
}
};
Fd_Snap_Siblings_Left_Same snap_siblings_left_same;
@ -1516,7 +1516,7 @@ public:
}
void draw(Snap_Data &d) override {
if (best_match) draw_right_brace(best_match);
};
}
};
Fd_Snap_Siblings_Left snap_siblings_left;
@ -1528,7 +1528,7 @@ public:
}
void draw(Snap_Data &d) override {
if (best_match) draw_right_brace(best_match);
};
}
};
Fd_Snap_Siblings_Right_Same snap_siblings_right_same;
@ -1541,7 +1541,7 @@ public:
}
void draw(Snap_Data &d) override {
if (best_match) draw_left_brace(best_match);
};
}
};
Fd_Snap_Siblings_Right snap_siblings_right;
@ -1553,7 +1553,7 @@ public:
}
void draw(Snap_Data &d) override {
if (best_match) draw_top_brace(best_match);
};
}
};
Fd_Snap_Siblings_Top_Same snap_siblings_top_same;
@ -1566,7 +1566,7 @@ public:
}
void draw(Snap_Data &d) override {
if (best_match) draw_bottom_brace(best_match);
};
}
};
Fd_Snap_Siblings_Top snap_siblings_top;
@ -1578,7 +1578,7 @@ public:
}
void draw(Snap_Data &d) override {
if (best_match) draw_bottom_brace(best_match);
};
}
};
Fd_Snap_Siblings_Bottom_Same snap_siblings_bottom_same;
@ -1591,7 +1591,7 @@ public:
}
void draw(Snap_Data &d) override {
if (best_match) draw_top_brace(best_match);
};
}
};
Fd_Snap_Siblings_Bottom snap_siblings_bottom;
@ -1624,7 +1624,7 @@ public:
}
void draw(Snap_Data &d) override {
draw_width(d.bx, d.bt+7, d.br, 0);
};
}
};
Fd_Snap_Widget_Ideal_Width snap_widget_ideal_width;
@ -1651,7 +1651,7 @@ public:
}
void draw(Snap_Data &d) override {
draw_height(d.br+7, d.by, d.bt, 0);
};
}
};
Fd_Snap_Widget_Ideal_Height snap_widget_ideal_height;

4
src/Fl_Grid.cxx
View File

@ -39,7 +39,7 @@ class Fl_Grid::Col {
weight_ = 50;
gap_ = -1;
}
~Col() {};
~Col() {}
};
// private class Row for row management
@ -63,7 +63,7 @@ class Fl_Grid::Row {
~Row() {
free_cells();
};
}
// Fl_Grid::Row::free_cells() - free all cells of a row

68
src/drivers/Wayland/Fl_Wayland_Window_Driver.H
View File

@ -63,7 +63,7 @@ private:
struct gl_start_support *gl_start_support_; // for support of gl_start/gl_finish
bool is_popup_window_;
public:
inline Fl_Cursor standard_cursor() { return standard_cursor_; };
inline Fl_Cursor standard_cursor() { return standard_cursor_; }
bool in_handle_configure; // distinguish OS and user window resize
struct surface_output { // for linked list of displays where a surface maps
@ -78,7 +78,7 @@ public:
static void delete_cursor(struct custom_cursor *custom, bool delete_rgb = true);
void decorated_win_size(int &w, int &h);
void shape_bitmap_(Fl_Image* b);
void shape_alpha_(Fl_Image* img, int offset) FL_OVERRIDE;
void shape_alpha_(Fl_Image* img, int offset) override;
FL_EXPORT int wld_scale(); // used by class Fl_Wayland_Gl_Window_Driver
cairo_rectangle_int_t *subRect() { return subRect_; } // getter
void subRect(cairo_rectangle_int_t *r); // setter
@ -96,49 +96,49 @@ public:
static Fl_Wayland_Plugin *gl_plugin();
// --- window data
int decorated_w() FL_OVERRIDE;
int decorated_h() FL_OVERRIDE;
const Fl_Image* shape() FL_OVERRIDE;
int decorated_w() override;
int decorated_h() override;
const Fl_Image* shape() override;
// --- window management
void makeWindow() FL_OVERRIDE;
void take_focus() FL_OVERRIDE;
void flush() FL_OVERRIDE;
void flush_overlay() FL_OVERRIDE;
void draw_end() FL_OVERRIDE;
void make_current() FL_OVERRIDE;
void show() FL_OVERRIDE;
void resize(int X,int Y,int W,int H) FL_OVERRIDE;
void label(const char *name, const char *mininame) FL_OVERRIDE;
void hide() FL_OVERRIDE;
void map() FL_OVERRIDE;
void unmap() FL_OVERRIDE;
void fullscreen_on() FL_OVERRIDE;
void fullscreen_off(int X, int Y, int W, int H) FL_OVERRIDE;
void maximize() FL_OVERRIDE;
void un_maximize() FL_OVERRIDE;
void use_border() FL_OVERRIDE;
void size_range() FL_OVERRIDE;
void iconize() FL_OVERRIDE;
void decoration_sizes(int *top, int *left, int *right, int *bottom) FL_OVERRIDE;
void makeWindow() override;
void take_focus() override;
void flush() override;
void flush_overlay() override;
void draw_end() override;
void make_current() override;
void show() override;
void resize(int X,int Y,int W,int H) override;
void label(const char *name, const char *mininame) override;
void hide() override;
void map() override;
void unmap() override;
void fullscreen_on() override;
void fullscreen_off(int X, int Y, int W, int H) override;
void maximize() override;
void un_maximize() override;
void use_border() override;
void size_range() override;
void iconize() override;
void decoration_sizes(int *top, int *left, int *right, int *bottom) override;
// --- window cursor stuff
int set_cursor(Fl_Cursor) FL_OVERRIDE;
int set_cursor(const Fl_RGB_Image*, int, int) FL_OVERRIDE;
int set_cursor(Fl_Cursor) override;
int set_cursor(const Fl_RGB_Image*, int, int) override;
int set_cursor_4args(const Fl_RGB_Image*, int, int, bool);
void shape(const Fl_Image* img) FL_OVERRIDE;
void shape(const Fl_Image* img) override;
void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left,
Fl_RGB_Image*& bottom, Fl_RGB_Image*& right) FL_OVERRIDE;
Fl_RGB_Image*& bottom, Fl_RGB_Image*& right) override;
int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y,
void (*draw_area)(void*, int,int,int,int), void* data) FL_OVERRIDE;
void wait_for_expose() FL_OVERRIDE;
void (*draw_area)(void*, int,int,int,int), void* data) override;
void wait_for_expose() override;
// menu-related stuff
void reposition_menu_window(int x, int y) FL_OVERRIDE;
void menu_window_area(int &X, int &Y, int &W, int &H, int nscreen = -1) FL_OVERRIDE;
void reposition_menu_window(int x, int y) override;
void menu_window_area(int &X, int &Y, int &W, int &H, int nscreen = -1) override;
static bool new_popup; // to support tall menu buttons
bool process_menu_or_tooltip(struct wld_window *);
static Fl_Window *previous_floatingtitle; // to support floating menuwindow w/ title
void allow_expand_outside_parent() FL_OVERRIDE { can_expand_outside_parent_ = true; }
void allow_expand_outside_parent() override { can_expand_outside_parent_ = true; }
};