mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warning, dependencies, and trailing whitespace 

The benign warning was:
  ‘Fl_Browser_::hscrollbar’ will be initialized after [-Wreorder]
  ‘int Fl_Browser_::linespacing_’ ...
This commit is contained in:
Albrecht Schlosser 2023-11-27 15:33:53 +01:00
parent 6ea31316fb
commit 57371365d8
11 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/Fl_Text_Display.H
View File

@ -498,7 +498,7 @@ protected:
int leftClip, int rightClip) const;
int handle_rmb(int readonly);
void draw_line_numbers(bool clearAll);
void clear_rect(int style, int x, int y, int width, int height) const;

2
fluid/factory.cxx
View File

@ -868,7 +868,7 @@ public:
int tsize_;
Fl_Color tcolor_;
Fl_Batchmode_Terminal(int x, int y, int w, int h, const char *l=NULL)
: Fl_Group(x, y, w, h, l)
: Fl_Group(x, y, w, h, l)
{ // set the defaults that Fl_Terminal would set
box(FL_DOWN_BOX);
color(FL_FOREGROUND_COLOR);

18
fluid/makedepend
View File

@ -74,11 +74,11 @@ alignment_panel.o: ../FL/Fl_Scheme.H
alignment_panel.o: ../FL/Fl_Scheme_Choice.H
alignment_panel.o: ../FL/Fl_Scrollbar.H
alignment_panel.o: ../FL/Fl_Shortcut_Button.H
alignment_panel.o: ../FL/Fl_Simple_Terminal.H
alignment_panel.o: ../FL/Fl_Slider.H
alignment_panel.o: ../FL/Fl_Spinner.H
alignment_panel.o: ../FL/fl_string_functions.h
alignment_panel.o: ../FL/Fl_Tabs.H
alignment_panel.o: ../FL/Fl_Terminal.H
alignment_panel.o: ../FL/Fl_Text_Buffer.H
alignment_panel.o: ../FL/Fl_Text_Display.H
alignment_panel.o: ../FL/Fl_Text_Editor.H
@ -363,10 +363,10 @@ factory.o: ../FL/Fl_Repeat_Button.H
factory.o: ../FL/Fl_RGB_Image.H
factory.o: ../FL/Fl_Roller.H
factory.o: ../FL/Fl_Scrollbar.H
factory.o: ../FL/Fl_Simple_Terminal.H
factory.o: ../FL/Fl_Slider.H
factory.o: ../FL/Fl_Spinner.H
factory.o: ../FL/Fl_Tabs.H
factory.o: ../FL/Fl_Terminal.H
factory.o: ../FL/Fl_Text_Buffer.H
factory.o: ../FL/Fl_Text_Display.H
factory.o: ../FL/Fl_Text_Editor.H
@ -448,11 +448,11 @@ Fd_Snap_Action.o: ../FL/Fl_Scheme.H
Fd_Snap_Action.o: ../FL/Fl_Scheme_Choice.H
Fd_Snap_Action.o: ../FL/Fl_Scrollbar.H
Fd_Snap_Action.o: ../FL/Fl_Shortcut_Button.H
Fd_Snap_Action.o: ../FL/Fl_Simple_Terminal.H
Fd_Snap_Action.o: ../FL/Fl_Slider.H
Fd_Snap_Action.o: ../FL/Fl_Spinner.H
Fd_Snap_Action.o: ../FL/fl_string_functions.h
Fd_Snap_Action.o: ../FL/Fl_Tabs.H
Fd_Snap_Action.o: ../FL/Fl_Terminal.H
Fd_Snap_Action.o: ../FL/Fl_Text_Buffer.H
Fd_Snap_Action.o: ../FL/Fl_Text_Display.H
Fd_Snap_Action.o: ../FL/Fl_Text_Editor.H
@ -530,11 +530,11 @@ file.o: ../FL/Fl_Scheme_Choice.H
file.o: ../FL/Fl_Scrollbar.H
file.o: ../FL/Fl_Shared_Image.H
file.o: ../FL/Fl_Shortcut_Button.H
file.o: ../FL/Fl_Simple_Terminal.H
file.o: ../FL/Fl_Slider.H
file.o: ../FL/Fl_Spinner.H
file.o: ../FL/fl_string_functions.h
file.o: ../FL/Fl_Tabs.H
file.o: ../FL/Fl_Terminal.H
file.o: ../FL/Fl_Text_Buffer.H
file.o: ../FL/Fl_Text_Display.H
file.o: ../FL/Fl_Text_Editor.H
@ -623,11 +623,11 @@ fluid.o: ../FL/Fl_Scheme_Choice.H
fluid.o: ../FL/Fl_Scrollbar.H
fluid.o: ../FL/Fl_Shared_Image.H
fluid.o: ../FL/Fl_Shortcut_Button.H
fluid.o: ../FL/Fl_Simple_Terminal.H
fluid.o: ../FL/Fl_Slider.H
fluid.o: ../FL/Fl_Spinner.H
fluid.o: ../FL/fl_string_functions.h
fluid.o: ../FL/Fl_Tabs.H
fluid.o: ../FL/Fl_Terminal.H
fluid.o: ../FL/Fl_Text_Buffer.H
fluid.o: ../FL/Fl_Text_Display.H
fluid.o: ../FL/Fl_Text_Editor.H
@ -869,6 +869,7 @@ Fl_Function_Type.o: Fl_Window_Type.h
Fl_Function_Type.o: function_panel.h
Fl_Function_Type.o: mergeback.h
Fl_Function_Type.o: StyleParse.h
Fl_Function_Type.o: undo.h
Fl_Function_Type.o: widget_browser.h
Fl_Grid_Type.o: ../config.h
Fl_Grid_Type.o: ../FL/Enumerations.H
@ -1149,12 +1150,12 @@ Fl_Widget_Type.o: ../FL/Fl_Scrollbar.H
Fl_Widget_Type.o: ../FL/Fl_Shared_Image.H
Fl_Widget_Type.o: ../FL/Fl_Shortcut_Button.H
Fl_Widget_Type.o: ../FL/fl_show_colormap.H
Fl_Widget_Type.o: ../FL/Fl_Simple_Terminal.H
Fl_Widget_Type.o: ../FL/Fl_Slider.H
Fl_Widget_Type.o: ../FL/Fl_Spinner.H
Fl_Widget_Type.o: ../FL/fl_string_functions.h
Fl_Widget_Type.o: ../FL/Fl_Table.H
Fl_Widget_Type.o: ../FL/Fl_Tabs.H
Fl_Widget_Type.o: ../FL/Fl_Terminal.H
Fl_Widget_Type.o: ../FL/Fl_Text_Buffer.H
Fl_Widget_Type.o: ../FL/Fl_Text_Display.H
Fl_Widget_Type.o: ../FL/Fl_Text_Editor.H
@ -1247,11 +1248,11 @@ Fl_Window_Type.o: ../FL/Fl_Scheme_Choice.H
Fl_Window_Type.o: ../FL/Fl_Scrollbar.H
Fl_Window_Type.o: ../FL/Fl_Shared_Image.H
Fl_Window_Type.o: ../FL/Fl_Shortcut_Button.H
Fl_Window_Type.o: ../FL/Fl_Simple_Terminal.H
Fl_Window_Type.o: ../FL/Fl_Slider.H
Fl_Window_Type.o: ../FL/Fl_Spinner.H
Fl_Window_Type.o: ../FL/fl_string_functions.h
Fl_Window_Type.o: ../FL/Fl_Tabs.H
Fl_Window_Type.o: ../FL/Fl_Terminal.H
Fl_Window_Type.o: ../FL/Fl_Text_Buffer.H
Fl_Window_Type.o: ../FL/Fl_Text_Display.H
Fl_Window_Type.o: ../FL/Fl_Text_Editor.H
@ -1299,7 +1300,6 @@ function_panel.o: ../FL/Fl_Browser_.H
function_panel.o: ../FL/Fl_Button.H
function_panel.o: ../FL/Fl_Cairo.H
function_panel.o: ../FL/fl_casts.H
function_panel.o: ../FL/Fl_Check_Button.H
function_panel.o: ../FL/Fl_Choice.H
function_panel.o: ../FL/fl_config.h
function_panel.o: ../FL/Fl_Device.H
@ -1478,11 +1478,11 @@ shell_command.o: ../FL/Fl_Scheme.H
shell_command.o: ../FL/Fl_Scheme_Choice.H
shell_command.o: ../FL/Fl_Scrollbar.H
shell_command.o: ../FL/Fl_Shortcut_Button.H
shell_command.o: ../FL/Fl_Simple_Terminal.H
shell_command.o: ../FL/Fl_Slider.H
shell_command.o: ../FL/Fl_Spinner.H
shell_command.o: ../FL/fl_string_functions.h
shell_command.o: ../FL/Fl_Tabs.H
shell_command.o: ../FL/Fl_Terminal.H
shell_command.o: ../FL/Fl_Text_Buffer.H
shell_command.o: ../FL/Fl_Text_Display.H
shell_command.o: ../FL/Fl_Text_Editor.H

2
fluid/sourceview_panel.cxx
View File

@ -32,7 +32,7 @@ extern void reveal_in_browser(Fl_Type *t);
/**
Update the header and source code highlighting depending on the
currently selected object
The Source View system offers an immediate preview of the code
files that will be generated by FLUID. It also marks the code
generated for the last selected item in the header and the source

2
fluid/template_panel.cxx
View File

@ -307,7 +307,7 @@ void template_load() {
"er\n}\n", f);
fclose(f);
}
template_install(path, "/FLTK_License.fl", tmpl_FLTK_License_fl, sizeof(tmpl_FLTK_License_fl), tmpl_FLTK_License_fl_size);
template_install(path, "/1of7GUIs.fl", tmpl_1of7GUIs_fl, sizeof(tmpl_1of7GUIs_fl), tmpl_1of7GUIs_fl_size);
sample_templates_generated = 2;

2
fluid/template_panel.fl
View File

@ -265,7 +265,7 @@ if (sample_templates_generated < 2) {
"er\\n}\\n", f);
fclose(f);
}
template_install(path, "/FLTK_License.fl", tmpl_FLTK_License_fl, sizeof(tmpl_FLTK_License_fl), tmpl_FLTK_License_fl_size);
template_install(path, "/1of7GUIs.fl", tmpl_1of7GUIs_fl, sizeof(tmpl_1of7GUIs_fl), tmpl_1of7GUIs_fl_size);
sample_templates_generated = 2;

4
src/Fl_Browser_.cxx
View File

@ -953,9 +953,9 @@ J1:
*/
Fl_Browser_::Fl_Browser_(int X, int Y, int W, int H, const char* L)
: Fl_Group(X, Y, W, H, L),
linespacing_(0),
scrollbar(0, 0, 0, 0, 0), // they will be resized by draw()
hscrollbar(0, 0, 0, 0, 0),
linespacing_(0)
hscrollbar(0, 0, 0, 0, 0)
{
box(FL_NO_BOX);
align(FL_ALIGN_BOTTOM);

6
src/Fl_Tile.cxx
View File

@ -56,7 +56,7 @@
In this mode, the child that is marked resizable() will behave as it would
in a regular Fl_Group widget.
When dragging edges or intersections with the mouse, Fl_Tile will ensure that
none of the children shrinks to a size that is smaller than requested.
none of the children shrinks to a size that is smaller than requested.
When resizing the Fl_Tile group, size ranges are not enforced by the tile.
Instead, the size range of the enclosing window should be limited to a
valid range.
@ -155,7 +155,7 @@ static Fl_Cursor Fl_Tile_cursors[4] = {
static int fl_min(int a, int b) { return a<b ? a : b; }
static int fl_max(int a, int b) { return a>b ? a : b; }
/**
/**
Request for children to change their layout.
drag_intersection requests that all children with the left edge at old_l to
@ -695,7 +695,7 @@ int Fl_Tile::handle(int event) {
// if (damage()) return 1; // don't fall behind
case FL_RELEASE: {
if (!sdrag) break;
Fl_Widget* r = resizable();
Fl_Widget* r = resizable();
if (size_range_ || !r) r = this;
int newx;
if (sdrag&DRAGH) {

4
src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
View File

@ -910,7 +910,7 @@ void Fl_Cairo_Graphics_Driver::uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_
}
void Fl_Cairo_Graphics_Driver::draw_fixed(Fl_Bitmap *bm,int XP, int YP, int WP, int HP,
void Fl_Cairo_Graphics_Driver::draw_fixed(Fl_Bitmap *bm,int XP, int YP, int WP, int HP,
int cx, int cy) {
cairo_pattern_t *pat = NULL;
float s = wld_scale * scale();
@ -999,7 +999,7 @@ void Fl_Cairo_Graphics_Driver::cache(Fl_Bitmap *bm) {
}
void Fl_Cairo_Graphics_Driver::draw_fixed(Fl_Pixmap *pxm,int XP, int YP, int WP, int HP,
void Fl_Cairo_Graphics_Driver::draw_fixed(Fl_Pixmap *pxm,int XP, int YP, int WP, int HP,
int cx, int cy) {
cairo_pattern_t *pat = NULL;
float s = wld_scale * scale();

4
src/makedepend
View File

@ -2439,6 +2439,7 @@ Fl_Input.o: ../FL/Fl_Image.H
Fl_Input.o: ../FL/Fl_Input.H
Fl_Input.o: ../FL/Fl_Input_.H
Fl_Input.o: ../FL/Fl_Int_Input.H
Fl_Input.o: ../FL/Fl_Menu_Item.H
Fl_Input.o: ../FL/Fl_Multiline_Input.H
Fl_Input.o: ../FL/Fl_Multiline_Output.H
Fl_Input.o: ../FL/Fl_Output.H
@ -3929,6 +3930,9 @@ Fl_Text_Display.o: ../FL/Fl_Export.H
Fl_Text_Display.o: ../FL/Fl_Graphics_Driver.H
Fl_Text_Display.o: ../FL/Fl_Group.H
Fl_Text_Display.o: ../FL/Fl_Image.H
Fl_Text_Display.o: ../FL/Fl_Input.H
Fl_Text_Display.o: ../FL/Fl_Input_.H
Fl_Text_Display.o: ../FL/Fl_Menu_Item.H
Fl_Text_Display.o: ../FL/Fl_Pixmap.H
Fl_Text_Display.o: ../FL/Fl_Plugin.H
Fl_Text_Display.o: ../FL/Fl_Preferences.H

15
test/makedepend
View File

@ -3149,3 +3149,18 @@ windowfocus.o: ../FL/fl_utf8.h
windowfocus.o: ../FL/Fl_Widget.H
windowfocus.o: ../FL/Fl_Window.H
windowfocus.o: ../FL/platform_types.h
wizard.o: ../FL/Enumerations.H
wizard.o: ../FL/Fl.H
wizard.o: ../FL/fl_attr.h
wizard.o: ../FL/Fl_Button.H
wizard.o: ../FL/Fl_Cairo.H
wizard.o: ../FL/fl_casts.H
wizard.o: ../FL/fl_config.h
wizard.o: ../FL/Fl_Export.H
wizard.o: ../FL/Fl_Group.H
wizard.o: ../FL/fl_types.h
wizard.o: ../FL/fl_utf8.h
wizard.o: ../FL/Fl_Widget.H
wizard.o: ../FL/Fl_Window.H
wizard.o: ../FL/Fl_Wizard.H
wizard.o: ../FL/platform_types.h