Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-30 04:55:29 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update dependencies and fix whitespace errors

Browse Source 
- replace tabs with spaces
- remove trailing whitespace
This commit is contained in:
Albrecht Schlosser
2023-02-02 17:03:09 +01:00
parent fb00fb3d66
commit 4e75549e7b
16 changed files with 488 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cairo/makedepend
+1
View File
@@ -2,6 +2,7 @@
Fl_Cairo.o: ../FL/Enumerations.H
Fl_Cairo.o: ../FL/Fl.H
Fl_Cairo.o: ../FL/fl_attr.h
Fl_Cairo.o: ../FL/Fl_Bitmap.H
Fl_Cairo.o: ../FL/Fl_Cairo.H
Fl_Cairo.o: ../FL/fl_casts.H
examples/animgifimage.cxx
+1 -1
View File
@@ -196,7 +196,7 @@ bool openDirectory(const char *dir, char *flags) {
if (!p) continue;
if (*(p+4)) continue; // is no extension!
snprintf(buf, sizeof(buf), "%s/%s", dir, name);
if (strstr(name, "debug")) // hack: when name contains 'debug' open single frames
if (strstr(name, "debug")) // hack: when name contains 'debug' open single frames
strcat(flags, "d");
if (openFile(buf, flags, cnt == 0))
cnt++;
fltk-options/makedepend
+42
View File
@@ -1 +1,43 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
fltk-options.o: ../config.h
fltk-options.o: ../FL/Enumerations.H
fltk-options.o: ../FL/filename.H
fltk-options.o: ../FL/Fl.H
fltk-options.o: ../FL/fl_attr.h
fltk-options.o: ../FL/Fl_Bitmap.H
fltk-options.o: ../FL/Fl_Box.H
fltk-options.o: ../FL/Fl_Browser.H
fltk-options.o: ../FL/Fl_Browser_.H
fltk-options.o: ../FL/Fl_Button.H
fltk-options.o: ../FL/Fl_Cairo.H
fltk-options.o: ../FL/fl_casts.H
fltk-options.o: ../FL/Fl_Choice.H
fltk-options.o: ../FL/fl_config.h
fltk-options.o: ../FL/Fl_Device.H
fltk-options.o: ../FL/Fl_Double_Window.H
fltk-options.o: ../FL/fl_draw.H
fltk-options.o: ../FL/Fl_Export.H
fltk-options.o: ../FL/Fl_Graphics_Driver.H
fltk-options.o: ../FL/Fl_Group.H
fltk-options.o: ../FL/Fl_Hold_Browser.H
fltk-options.o: ../FL/Fl_Image.H
fltk-options.o: ../FL/Fl_Menu_.H
fltk-options.o: ../FL/Fl_Menu_Item.H
fltk-options.o: ../FL/Fl_Pack.H
fltk-options.o: ../FL/Fl_Pixmap.H
fltk-options.o: ../FL/Fl_Plugin.H
fltk-options.o: ../FL/Fl_Preferences.H
fltk-options.o: ../FL/Fl_Rect.H
fltk-options.o: ../FL/Fl_RGB_Image.H
fltk-options.o: ../FL/Fl_Scroll.H
fltk-options.o: ../FL/Fl_Scrollbar.H
fltk-options.o: ../FL/Fl_Slider.H
fltk-options.o: ../FL/Fl_Tooltip.H
fltk-options.o: ../FL/fl_types.h
fltk-options.o: ../FL/fl_utf8.h
fltk-options.o: ../FL/Fl_Valuator.H
fltk-options.o: ../FL/Fl_Widget.H
fltk-options.o: ../FL/Fl_Window.H
fltk-options.o: ../FL/platform_types.h
fltk-options.o: ../src/flstring.h
fluid/makedepend
+41
View File
@@ -3,6 +3,8 @@
about_panel.o: ../config.h
about_panel.o: ../FL/Enumerations.H
about_panel.o: ../FL/Fl.H
about_panel.o: ../FL/Fl_Anim_GIF_Image.H
about_panel.o: ../FL/fl_attr.h
about_panel.o: ../FL/Fl_Bitmap.H
about_panel.o: ../FL/Fl_Box.H
about_panel.o: ../FL/Fl_Button.H
@@ -11,6 +13,7 @@ about_panel.o: ../FL/fl_casts.H
about_panel.o: ../FL/fl_config.h
about_panel.o: ../FL/Fl_Double_Window.H
about_panel.o: ../FL/Fl_Export.H
about_panel.o: ../FL/Fl_GIF_Image.H
about_panel.o: ../FL/Fl_Group.H
about_panel.o: ../FL/Fl_Image.H
about_panel.o: ../FL/Fl_Pixmap.H
@@ -57,6 +60,8 @@ alignment_panel.o: ../FL/Fl_Repeat_Button.H
alignment_panel.o: ../FL/Fl_Return_Button.H
alignment_panel.o: ../FL/Fl_RGB_Image.H
alignment_panel.o: ../FL/Fl_Round_Button.H
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_Simple_Terminal.H
alignment_panel.o: ../FL/Fl_Slider.H
@@ -79,6 +84,7 @@ alignment_panel.o: widget_browser.h
align_widget.o: ../FL/Enumerations.H
align_widget.o: ../FL/filename.H
align_widget.o: ../FL/Fl.H
align_widget.o: ../FL/fl_attr.h
align_widget.o: ../FL/Fl_Bitmap.H
align_widget.o: ../FL/Fl_Cairo.H
align_widget.o: ../FL/fl_casts.H
@@ -106,6 +112,7 @@ align_widget.o: ../FL/Fl_Window.H
align_widget.o: ../FL/Fl_Wizard.H
align_widget.o: ../FL/platform_types.h
align_widget.o: align_widget.h
align_widget.o: code.h
align_widget.o: fluid.h
align_widget.o: Fl_Group_Type.h
align_widget.o: Fl_Type.h
@@ -149,6 +156,8 @@ code.o: ../FL/Fl_Repeat_Button.H
code.o: ../FL/Fl_Return_Button.H
code.o: ../FL/Fl_RGB_Image.H
code.o: ../FL/Fl_Round_Button.H
code.o: ../FL/Fl_Scheme.H
code.o: ../FL/Fl_Scheme_Choice.H
code.o: ../FL/Fl_Scrollbar.H
code.o: ../FL/Fl_Shared_Image.H
code.o: ../FL/Fl_Simple_Terminal.H
@@ -183,6 +192,7 @@ code.o: shell_command.h
code.o: widget_browser.h
CodeEditor.o: ../FL/Enumerations.H
CodeEditor.o: ../FL/Fl.H
CodeEditor.o: ../FL/fl_attr.h
CodeEditor.o: ../FL/Fl_Bitmap.H
CodeEditor.o: ../FL/Fl_Cairo.H
CodeEditor.o: ../FL/fl_casts.H
@@ -219,12 +229,14 @@ ExternalCodeEditor_UNIX.o: ../FL/Fl_Cairo.H
ExternalCodeEditor_UNIX.o: ../FL/fl_casts.H
ExternalCodeEditor_UNIX.o: ../FL/fl_config.h
ExternalCodeEditor_UNIX.o: ../FL/Fl_Export.H
ExternalCodeEditor_UNIX.o: ../FL/Fl_Image.H
ExternalCodeEditor_UNIX.o: ../FL/Fl_Menu_Item.H
ExternalCodeEditor_UNIX.o: ../FL/Fl_Preferences.H
ExternalCodeEditor_UNIX.o: ../FL/Fl_String.H
ExternalCodeEditor_UNIX.o: ../FL/fl_string_functions.h
ExternalCodeEditor_UNIX.o: ../FL/fl_types.h
ExternalCodeEditor_UNIX.o: ../FL/fl_utf8.h
ExternalCodeEditor_UNIX.o: ../FL/Fl_Widget.H
ExternalCodeEditor_UNIX.o: ../FL/platform_types.h
ExternalCodeEditor_UNIX.o: ExternalCodeEditor_UNIX.h
ExternalCodeEditor_UNIX.o: fluid.h
@@ -233,6 +245,7 @@ factory.o: ../FL/Enumerations.H
factory.o: ../FL/filename.H
factory.o: ../FL/Fl.H
factory.o: ../FL/Fl_Adjuster.H
factory.o: ../FL/fl_attr.h
factory.o: ../FL/Fl_Bitmap.H
factory.o: ../FL/Fl_Box.H
factory.o: ../FL/Fl_Browser.H
@@ -298,6 +311,7 @@ factory.o: ../FL/Fl_Window.H
factory.o: ../FL/Fl_Wizard.H
factory.o: ../FL/platform_types.h
factory.o: ../src/flstring.h
factory.o: code.h
factory.o: factory.h
factory.o: fluid.h
factory.o: Fl_Group_Type.h
@@ -344,6 +358,8 @@ file.o: ../FL/Fl_Repeat_Button.H
file.o: ../FL/Fl_Return_Button.H
file.o: ../FL/Fl_RGB_Image.H
file.o: ../FL/Fl_Round_Button.H
file.o: ../FL/Fl_Scheme.H
file.o: ../FL/Fl_Scheme_Choice.H
file.o: ../FL/Fl_Scrollbar.H
file.o: ../FL/Fl_Shared_Image.H
file.o: ../FL/Fl_Simple_Terminal.H
@@ -374,6 +390,7 @@ file.o: Fl_Type.h
file.o: Fl_Widget_Type.h
file.o: Fl_Window_Type.h
file.o: shell_command.h
file.o: undo.h
file.o: widget_browser.h
fluid.o: ../config.h
fluid.o: ../FL/Enumerations.H
@@ -427,6 +444,8 @@ fluid.o: ../FL/Fl_Repeat_Button.H
fluid.o: ../FL/Fl_Return_Button.H
fluid.o: ../FL/Fl_RGB_Image.H
fluid.o: ../FL/Fl_Round_Button.H
fluid.o: ../FL/Fl_Scheme.H
fluid.o: ../FL/Fl_Scheme_Choice.H
fluid.o: ../FL/Fl_Scrollbar.H
fluid.o: ../FL/Fl_Shared_Image.H
fluid.o: ../FL/Fl_Simple_Terminal.H
@@ -474,6 +493,7 @@ Fluid_Image.o: ../config.h
Fluid_Image.o: ../FL/Enumerations.H
Fluid_Image.o: ../FL/filename.H
Fluid_Image.o: ../FL/Fl.H
Fluid_Image.o: ../FL/Fl_Anim_GIF_Image.H
Fluid_Image.o: ../FL/fl_ask.H
Fluid_Image.o: ../FL/fl_attr.h
Fluid_Image.o: ../FL/Fl_Bitmap.H
@@ -495,6 +515,7 @@ Fluid_Image.o: ../FL/Fl_File_Chooser.H
Fluid_Image.o: ../FL/Fl_File_Icon.H
Fluid_Image.o: ../FL/Fl_File_Input.H
Fluid_Image.o: ../FL/Fl_Flex.H
Fluid_Image.o: ../FL/Fl_GIF_Image.H
Fluid_Image.o: ../FL/Fl_Graphics_Driver.H
Fluid_Image.o: ../FL/Fl_Group.H
Fluid_Image.o: ../FL/Fl_Image.H
@@ -514,6 +535,7 @@ Fluid_Image.o: ../FL/Fl_RGB_Image.H
Fluid_Image.o: ../FL/Fl_Shared_Image.H
Fluid_Image.o: ../FL/Fl_String.H
Fluid_Image.o: ../FL/fl_string_functions.h
Fluid_Image.o: ../FL/Fl_SVG_Image.H
Fluid_Image.o: ../FL/Fl_Tabs.H
Fluid_Image.o: ../FL/Fl_Tile.H
Fluid_Image.o: ../FL/fl_types.h
@@ -696,6 +718,8 @@ Fl_Menu_Type.o: ../FL/Fl_Repeat_Button.H
Fl_Menu_Type.o: ../FL/Fl_Return_Button.H
Fl_Menu_Type.o: ../FL/Fl_RGB_Image.H
Fl_Menu_Type.o: ../FL/Fl_Round_Button.H
Fl_Menu_Type.o: ../FL/Fl_Scheme.H
Fl_Menu_Type.o: ../FL/Fl_Scheme_Choice.H
Fl_Menu_Type.o: ../FL/Fl_Scrollbar.H
Fl_Menu_Type.o: ../FL/Fl_Shared_Image.H
Fl_Menu_Type.o: ../FL/Fl_Simple_Terminal.H
@@ -821,6 +845,8 @@ Fl_Widget_Type.o: ../FL/Fl_Repeat_Button.H
Fl_Widget_Type.o: ../FL/Fl_Return_Button.H
Fl_Widget_Type.o: ../FL/Fl_RGB_Image.H
Fl_Widget_Type.o: ../FL/Fl_Round_Button.H
Fl_Widget_Type.o: ../FL/Fl_Scheme.H
Fl_Widget_Type.o: ../FL/Fl_Scheme_Choice.H
Fl_Widget_Type.o: ../FL/Fl_Scroll.H
Fl_Widget_Type.o: ../FL/Fl_Scrollbar.H
Fl_Widget_Type.o: ../FL/Fl_Shared_Image.H
@@ -907,7 +933,10 @@ Fl_Window_Type.o: ../FL/Fl_Repeat_Button.H
Fl_Window_Type.o: ../FL/Fl_Return_Button.H
Fl_Window_Type.o: ../FL/Fl_RGB_Image.H
Fl_Window_Type.o: ../FL/Fl_Round_Button.H
Fl_Window_Type.o: ../FL/Fl_Scheme.H
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_Simple_Terminal.H
Fl_Window_Type.o: ../FL/Fl_Slider.H
Fl_Window_Type.o: ../FL/Fl_Spinner.H
@@ -949,6 +978,7 @@ Fl_Window_Type.o: widget_panel.h
function_panel.o: ../FL/Enumerations.H
function_panel.o: ../FL/filename.H
function_panel.o: ../FL/Fl.H
function_panel.o: ../FL/fl_attr.h
function_panel.o: ../FL/Fl_Bitmap.H
function_panel.o: ../FL/Fl_Box.H
function_panel.o: ../FL/Fl_Browser_.H
@@ -990,6 +1020,7 @@ function_panel.o: ../FL/Fl_Valuator.H
function_panel.o: ../FL/Fl_Widget.H
function_panel.o: ../FL/Fl_Window.H
function_panel.o: ../FL/platform_types.h
function_panel.o: code.h
function_panel.o: CodeEditor.h
function_panel.o: factory.h
function_panel.o: fluid.h
@@ -1004,6 +1035,7 @@ pixmaps.o: ../FL/Fl_Image.H
pixmaps.o: ../FL/Fl_Pixmap.H
pixmaps.o: pixmaps.h
pixmaps.o: pixmaps/bind.xpm
pixmaps.o: pixmaps/compressed.xpm
pixmaps.o: pixmaps/flAdjuster.xpm
pixmaps.o: pixmaps/flBox.xpm
pixmaps.o: pixmaps/flBrowser.xpm
@@ -1099,6 +1131,8 @@ shell_command.o: ../FL/Fl_Repeat_Button.H
shell_command.o: ../FL/Fl_Return_Button.H
shell_command.o: ../FL/Fl_RGB_Image.H
shell_command.o: ../FL/Fl_Round_Button.H
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_Simple_Terminal.H
shell_command.o: ../FL/Fl_Slider.H
@@ -1123,6 +1157,7 @@ Shortcut_Button.o: ../config.h
Shortcut_Button.o: ../FL/Enumerations.H
Shortcut_Button.o: ../FL/filename.H
Shortcut_Button.o: ../FL/Fl.H
Shortcut_Button.o: ../FL/fl_attr.h
Shortcut_Button.o: ../FL/Fl_Bitmap.H
Shortcut_Button.o: ../FL/Fl_Box.H
Shortcut_Button.o: ../FL/Fl_Browser_.H
@@ -1171,6 +1206,7 @@ Shortcut_Button.o: ../FL/platform.H
Shortcut_Button.o: ../FL/platform_types.h
Shortcut_Button.o: ../FL/x11.H
Shortcut_Button.o: ../src/flstring.h
Shortcut_Button.o: code.h
Shortcut_Button.o: CodeEditor.h
Shortcut_Button.o: factory.h
Shortcut_Button.o: fluid.h
@@ -1250,6 +1286,7 @@ undo.o: ../FL/Fl_Widget.H
undo.o: ../FL/Fl_Window.H
undo.o: ../FL/platform_types.h
undo.o: ../src/flstring.h
undo.o: code.h
undo.o: file.h
undo.o: fluid.h
undo.o: Fl_Type.h
@@ -1259,6 +1296,7 @@ undo.o: widget_browser.h
widget_browser.o: ../FL/Enumerations.H
widget_browser.o: ../FL/filename.H
widget_browser.o: ../FL/Fl.H
widget_browser.o: ../FL/fl_attr.h
widget_browser.o: ../FL/Fl_Bitmap.H
widget_browser.o: ../FL/Fl_Browser_.H
widget_browser.o: ../FL/Fl_Cairo.H
@@ -1283,6 +1321,7 @@ widget_browser.o: ../FL/fl_utf8.h
widget_browser.o: ../FL/Fl_Valuator.H
widget_browser.o: ../FL/Fl_Widget.H
widget_browser.o: ../FL/platform_types.h
widget_browser.o: code.h
widget_browser.o: fluid.h
widget_browser.o: Fl_Type.h
widget_browser.o: Fl_Widget_Type.h
@@ -1290,6 +1329,7 @@ widget_browser.o: pixmaps.h
widget_browser.o: widget_browser.h
widget_panel.o: ../FL/Enumerations.H
widget_panel.o: ../FL/Fl.H
widget_panel.o: ../FL/fl_attr.h
widget_panel.o: ../FL/Fl_Bitmap.H
widget_panel.o: ../FL/Fl_Box.H
widget_panel.o: ../FL/Fl_Button.H
@@ -1332,6 +1372,7 @@ widget_panel.o: ../FL/Fl_Value_Input.H
widget_panel.o: ../FL/Fl_Widget.H
widget_panel.o: ../FL/Fl_Window.H
widget_panel.o: ../FL/platform_types.h
widget_panel.o: code.h
widget_panel.o: CodeEditor.h
widget_panel.o: Fl_Type.h
widget_panel.o: Fl_Widget_Type.h
src/Fl_Anim_GIF_Image.cxx
+1 -1
View File
@@ -820,7 +820,7 @@ void Fl_Anim_GIF_Image::draw(int x, int y, int w, int h,
Fl_RGB_Image *rgb = fi_->frames[f].rgb;
if (rgb) {
float s = Fl_Graphics_Driver::default_driver().scale();
rgb->scale(s*fi_->frames[f].w, s*fi_->frames[f].h, 0, 1);
rgb->scale(s*fi_->frames[f].w, s*fi_->frames[f].h, 0, 1);
rgb->draw(x + s*fi_->frames[f].x, y + s*fi_->frames[f].y, w, h, cx, cy);
}
}
src/makedepend
+240 -17
View File
File diff suppressed because it is too large Load Diff
test/makedepend
+105 -2
View File
File diff suppressed because it is too large Load Diff
test/preferences.fl
+39 -39
View File
@@ -62,45 +62,45 @@ Function {gettext(const char *text)} {
for systems that don't have GNU libintl library.} open return_type {const char*}
} {
code {static const char* translation_table[][2] = {
{ "Alarm at:", "Wecken um:" },
{ "Bread:", "Brot:" },
{ "Breakfast:", "Frühstück:" },
{ "Cancel", "Abbrechen" },
{ "Drink:", "Getränk:" },
{ "English", "Englisch" },
{ "German", "Deutsch" },
{ "Get Up:", "Aufstehen:" },
{ "Language:", "Sprache:" },
{ "My Preferences", "Meine Vorlieben" },
{ "NY Times", "Der Spiegel" },
{ "Newspaper:", "Tageszeitung:" },
{ "OK", "OK" },
{ "Please restart the app to use your new language setting.",
"Bitte starten Sie die App erneut um Ihre Spracheinstellung zu nutzen." },
{ "Wear:", "Schuhwerk:" },
{ "a.m.", "früh" },
{ "bare foot", "barfuß" },
{ "brush teeth", "Zähne putzen" },
{ "coffee", "Kaffee" },
{ "eggs", "Eier" },
{ "flip flops", "Schlappen" },
{ "juice", "Saft" },
{ "left side", "linke Seite" },
{ "min.", "Min." },
{ "of the bed", "vom Bett" },
{ "p.m.", "spät" },
{ "right side", "rechte Seite" },
{ "rye", "Roggen" },
{ "sandals", "Sandalen" },
{ "shave", "rasieren" },
{ "shoes", "Schuhe" },
{ "shower", "duschen" },
{ "sourdough", "Sauerteig" },
{ "tea", "Tee" },
{ "wheat", "Weizen" },
{ "white", "Weißbrot" },
{ "with butter", "mit Butter" },
{ "with milk", "mit Milch" },
{ "Alarm at:", "Wecken um:" },
{ "Bread:", "Brot:" },
{ "Breakfast:", "Frühstück:" },
{ "Cancel", "Abbrechen" },
{ "Drink:", "Getränk:" },
{ "English", "Englisch" },
{ "German", "Deutsch" },
{ "Get Up:", "Aufstehen:" },
{ "Language:", "Sprache:" },
{ "My Preferences", "Meine Vorlieben" },
{ "NY Times", "Der Spiegel" },
{ "Newspaper:", "Tageszeitung:" },
{ "OK", "OK" },
{ "Please restart the app to use your new language setting.",
"Bitte starten Sie die App erneut um Ihre Spracheinstellung zu nutzen." },
{ "Wear:", "Schuhwerk:" },
{ "a.m.", "früh" },
{ "bare foot", "barfuß" },
{ "brush teeth", "Zähne putzen" },
{ "coffee", "Kaffee" },
{ "eggs", "Eier" },
{ "flip flops", "Schlappen" },
{ "juice", "Saft" },
{ "left side", "linke Seite" },
{ "min.", "Min." },
{ "of the bed", "vom Bett" },
{ "p.m.", "spät" },
{ "right side", "rechte Seite" },
{ "rye", "Roggen" },
{ "sandals", "Sandalen" },
{ "shave", "rasieren" },
{ "shoes", "Schuhe" },
{ "shower", "duschen" },
{ "sourdough", "Sauerteig" },
{ "tea", "Tee" },
{ "wheat", "Weizen" },
{ "white", "Weißbrot" },
{ "with butter", "mit Butter" },
{ "with milk", "mit Milch" },
};
int lang = g_language;
int i, n = 38;