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

Fix whitespace, update dependencies and fluid files

This commit is contained in:
Albrecht Schlosser 2022-03-03 17:20:24 +01:00
parent d8cb8ec916
commit a773fdc44b
10 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fluid/alignment_panel.cxx
View File

@ -640,7 +640,7 @@ static void refreshUI() {
static void readPrefs() { static void readPrefs() {
// read all preferences and refresh the GUI // read all preferences and refresh the GUI
{ {
Fl_Preferences prefs(Fl_Preferences::SYSTEM, "fltk.org", "fltk"); Fl_Preferences prefs(Fl_Preferences::SYSTEM_L, "fltk.org", "fltk");
Fl_Preferences opt_prefs(prefs, "options"); Fl_Preferences opt_prefs(prefs, "options");
opt_prefs.get("ArrowFocus", opt[Fl::OPTION_ARROW_FOCUS][1], 2); opt_prefs.get("ArrowFocus", opt[Fl::OPTION_ARROW_FOCUS][1], 2);
opt_prefs.get("VisibleFocus", opt[Fl::OPTION_VISIBLE_FOCUS][1], 2); opt_prefs.get("VisibleFocus", opt[Fl::OPTION_VISIBLE_FOCUS][1], 2);
@ -651,7 +651,7 @@ static void readPrefs() {
opt_prefs.get("ShowZoomFactor", opt[Fl::OPTION_SHOW_SCALING ][1], 2); opt_prefs.get("ShowZoomFactor", opt[Fl::OPTION_SHOW_SCALING ][1], 2);
} }
{ {
Fl_Preferences prefs(Fl_Preferences::USER, "fltk.org", "fltk"); Fl_Preferences prefs(Fl_Preferences::USER_L, "fltk.org", "fltk");
Fl_Preferences opt_prefs(prefs, "options"); Fl_Preferences opt_prefs(prefs, "options");
opt_prefs.get("ArrowFocus", opt[Fl::OPTION_ARROW_FOCUS][0], 2); opt_prefs.get("ArrowFocus", opt[Fl::OPTION_ARROW_FOCUS][0], 2);
opt_prefs.get("VisibleFocus", opt[Fl::OPTION_VISIBLE_FOCUS][0], 2); opt_prefs.get("VisibleFocus", opt[Fl::OPTION_VISIBLE_FOCUS][0], 2);
@ -670,7 +670,7 @@ static void readPrefs() {
static void writePrefs() { static void writePrefs() {
// write all preferences using the array // write all preferences using the array
{ {
Fl_Preferences prefs(Fl_Preferences::SYSTEM, "fltk.org", "fltk"); Fl_Preferences prefs(Fl_Preferences::SYSTEM_L, "fltk.org", "fltk");
Fl_Preferences opt_prefs(prefs, "options"); Fl_Preferences opt_prefs(prefs, "options");
if (opt[Fl::OPTION_ARROW_FOCUS][1]==2) opt_prefs.deleteEntry("ArrowFocus"); if (opt[Fl::OPTION_ARROW_FOCUS][1]==2) opt_prefs.deleteEntry("ArrowFocus");
else opt_prefs.set("ArrowFocus", opt[Fl::OPTION_ARROW_FOCUS][1]); else opt_prefs.set("ArrowFocus", opt[Fl::OPTION_ARROW_FOCUS][1]);
@ -688,7 +688,7 @@ static void writePrefs() {
else opt_prefs.set("ShowZoomFactor", opt[Fl::OPTION_SHOW_SCALING][1]); else opt_prefs.set("ShowZoomFactor", opt[Fl::OPTION_SHOW_SCALING][1]);
} }
{ {
Fl_Preferences prefs(Fl_Preferences::USER, "fltk.org", "fltk"); Fl_Preferences prefs(Fl_Preferences::USER_L, "fltk.org", "fltk");
Fl_Preferences opt_prefs(prefs, "options"); Fl_Preferences opt_prefs(prefs, "options");
if (opt[Fl::OPTION_ARROW_FOCUS][0]==2) opt_prefs.deleteEntry("ArrowFocus"); if (opt[Fl::OPTION_ARROW_FOCUS][0]==2) opt_prefs.deleteEntry("ArrowFocus");
else opt_prefs.set("ArrowFocus", opt[Fl::OPTION_ARROW_FOCUS][0]); else opt_prefs.set("ArrowFocus", opt[Fl::OPTION_ARROW_FOCUS][0]);

2
fluid/function_panel.fl
View File

@ -51,7 +51,7 @@ Function {make_function_panel()} {open
} { } {
Fl_Window function_panel { Fl_Window function_panel {
label {Function/Method Properties} open label {Function/Method Properties} open
xywh {540 418 343 232} type Double resizable modal visible xywh {540 418 343 232} type Double hide resizable modal
} { } {
Fl_Group {} {open Fl_Group {} {open
xywh {10 10 270 20} xywh {10 10 270 20}

1
fluid/makedepend
View File

@ -1119,6 +1119,7 @@ Shortcut_Button.o: ../FL/Fl_Return_Button.H
Shortcut_Button.o: ../FL/Fl_RGB_Image.H Shortcut_Button.o: ../FL/Fl_RGB_Image.H
Shortcut_Button.o: ../FL/Fl_Scrollbar.H Shortcut_Button.o: ../FL/Fl_Scrollbar.H
Shortcut_Button.o: ../FL/Fl_Slider.H Shortcut_Button.o: ../FL/Fl_Slider.H
Shortcut_Button.o: ../FL/fl_string_functions.h
Shortcut_Button.o: ../FL/Fl_Tabs.H Shortcut_Button.o: ../FL/Fl_Tabs.H
Shortcut_Button.o: ../FL/Fl_Text_Buffer.H Shortcut_Button.o: ../FL/Fl_Text_Buffer.H
Shortcut_Button.o: ../FL/Fl_Text_Display.H Shortcut_Button.o: ../FL/Fl_Text_Display.H

4
fluid/widget_panel.fl
View File

@ -31,8 +31,8 @@ Function {make_widget_panel()} {
} { } {
Fl_Window {} { Fl_Window {} {
comment {Use a Double Window to avoid flickering.} open comment {Use a Double Window to avoid flickering.} open
xywh {500 209 420 400} type Double labelsize 11 align 80 resizable hotspot xywh {500 209 420 400} type Double labelsize 11 align 80 hide resizable hotspot
code0 {o->size_range(o->w(), o->h());} size_range {420 400 0 0} visible code0 {o->size_range(o->w(), o->h());} size_range {420 400 0 0}
} { } {
Fl_Tabs {} { Fl_Tabs {} {
callback {propagate_load((Fl_Group *)o,v);} open callback {propagate_load((Fl_Group *)o,v);} open