| |
commit 797616841caaf3322c79c15b1d9c74d03b54ea12
Author: Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Sat Dec 18 18:20:15 2021 +0100
Commit: Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Sat Dec 18 18:26:48 2021 +0100
Remove unused and outdated demo, update dependencies
- remove test/connect.cxx
- fix typos in comments in a related android file
- update dependencies
CMake/Android/HelloAndroid.cxx.in | 19 +++++-----
fluid/makedepend | 78 +++++++++++++++++++++++++++++++++++++++
test/connect.cxx | 62 -------------------------------
3 files changed, 87 insertions(+), 72 deletions(-)
diff --git CMake/Android/HelloAndroid.cxx.in CMake/Android/HelloAndroid.cxx.in
index e79cfca..edba702 100644
--- CMake/Android/HelloAndroid.cxx.in
+++ CMake/Android/HelloAndroid.cxx.in
@@ -43,15 +43,15 @@
- no support for dead-key entry
- no Shift-Tab
- * test/CubeMain.cxx : UNSUPPROTED - needs OpenGL
- * test/CubeView.cxx : UNSUPPROTED - needs OpenGL
- * test/shape.cxx : UNSUPPROTED - needs OpenGL
- * test/cube.cxx : UNSUPPROTED - needs OpenGL
- * test/fractals.cxx : UNSUPPROTED - needs OpenGL
- * test/fracviewer.cxx : UNSUPPROTED - needs OpenGL
- * test/fullscreen.cxx : UNSUPPROTED - needs OpenGL
- * test/gl_overlay.cxx : UNSUPPROTED - needs OpenGL
- * test/glpuzzle.cxx : UNSUPPROTED - needs OpenGL
+ * test/CubeMain.cxx : UNSUPPORTED - needs OpenGL
+ * test/CubeView.cxx : UNSUPPORTED - needs OpenGL
+ * test/shape.cxx : UNSUPPORTED - needs OpenGL
+ * test/cube.cxx : UNSUPPORTED - needs OpenGL
+ * test/fractals.cxx : UNSUPPORTED - needs OpenGL
+ * test/fracviewer.cxx : UNSUPPORTED - needs OpenGL
+ * test/fullscreen.cxx : UNSUPPORTED - needs OpenGL
+ * test/gl_overlay.cxx : UNSUPPORTED - needs OpenGL
+ * test/glpuzzle.cxx : UNSUPPORTED - needs OpenGL
* test/mandelbrot.cxx : UNSUPPORTED - needs Fluid
* test/keyboard.cxx : UNSUPPORTED - needs Fluid
* test/CubeViewUI.fl
@@ -66,7 +66,6 @@
* test/preferences.fl
* test/tabs.fl
* test/cairo_test.cxx : UNSUPPORTED - needs Cairo
- * test/connect.cxx : UNSUPPORTED - Android is not Linux
* test/tiled_image.cxx : UNSUPPORTED - X11 only
* test/forms.cxx : UNSUPPORTED - needs Forms
diff --git fluid/makedepend fluid/makedepend
index 10a06ab..cce556b 100644
--- fluid/makedepend
+++ fluid/makedepend
@@ -72,6 +72,7 @@ alignment_panel.o: ../FL/Fl_Window.H
alignment_panel.o: ../FL/platform_types.h
alignment_panel.o: alignment_panel.h
alignment_panel.o: fluid.h
+alignment_panel.o: shell_command.h
alignment_panel.o: widget_browser.h
align_widget.o: ../FL/abi-version.h
align_widget.o: ../FL/Enumerations.H
@@ -170,6 +171,7 @@ code.o: Fl_Group_Type.h
code.o: Fl_Type.h
code.o: Fl_Widget_Type.h
code.o: Fl_Window_Type.h
+code.o: shell_command.h
code.o: widget_browser.h
CodeEditor.o: ../FL/abi-version.h
CodeEditor.o: ../FL/Enumerations.H
@@ -285,6 +287,7 @@ factory.o: fluid.h
factory.o: Fl_Type.h
factory.o: Fl_Widget_Type.h
factory.o: Fl_Window_Type.h
+factory.o: pixmaps.h
factory.o: undo.h
file.o: ../config.h
file.o: ../FL/abi-version.h
@@ -352,6 +355,7 @@ file.o: Fl_Function_Type.h
file.o: Fl_Type.h
file.o: Fl_Widget_Type.h
file.o: Fl_Window_Type.h
+file.o: shell_command.h
file.o: widget_browser.h
fluid.o: ../config.h
fluid.o: ../FL/abi-version.h
@@ -586,6 +590,7 @@ Fl_Group_Type.o: ../FL/Fl.H
Fl_Group_Type.o: ../FL/fl_ask.H
Fl_Group_Type.o: ../FL/fl_attr.h
Fl_Group_Type.o: ../FL/Fl_Bitmap.H
+Fl_Group_Type.o: ../FL/Fl_Browser_.H
Fl_Group_Type.o: ../FL/fl_casts.H
Fl_Group_Type.o: ../FL/Fl_Device.H
Fl_Group_Type.o: ../FL/fl_draw.H
@@ -620,6 +625,7 @@ Fl_Group_Type.o: fluid.h
Fl_Group_Type.o: Fl_Group_Type.h
Fl_Group_Type.o: Fl_Type.h
Fl_Group_Type.o: Fl_Widget_Type.h
+Fl_Group_Type.o: widget_browser.h
Fl_Menu_Type.o: ../config.h
Fl_Menu_Type.o: ../FL/abi-version.h
Fl_Menu_Type.o: ../FL/Enumerations.H
@@ -687,6 +693,7 @@ Fl_Menu_Type.o: Fl_Menu_Type.h
Fl_Menu_Type.o: Fl_Type.h
Fl_Menu_Type.o: Fl_Widget_Type.h
Fl_Menu_Type.o: Fl_Window_Type.h
+Fl_Menu_Type.o: shell_command.h
Fl_Menu_Type.o: Shortcut_Button.h
Fl_Menu_Type.o: widget_browser.h
Fl_Type.o: ../config.h
@@ -702,9 +709,11 @@ Fl_Type.o: ../FL/Fl_Device.H
Fl_Type.o: ../FL/fl_draw.H
Fl_Type.o: ../FL/Fl_Export.H
Fl_Type.o: ../FL/Fl_Graphics_Driver.H
+Fl_Type.o: ../FL/Fl_Group.H
Fl_Type.o: ../FL/Fl_Image.H
Fl_Type.o: ../FL/Fl_Menu.H
Fl_Type.o: ../FL/Fl_Menu_Item.H
+Fl_Type.o: ../FL/Fl_Pack.H
Fl_Type.o: ../FL/Fl_Pixmap.H
Fl_Type.o: ../FL/Fl_Plugin.H
Fl_Type.o: ../FL/Fl_Preferences.H
@@ -713,10 +722,12 @@ Fl_Type.o: ../FL/Fl_RGB_Image.H
Fl_Type.o: ../FL/Fl_Scrollbar.H
Fl_Type.o: ../FL/Fl_Shared_Image.H
Fl_Type.o: ../FL/Fl_Slider.H
+Fl_Type.o: ../FL/Fl_Tabs.H
Fl_Type.o: ../FL/fl_types.h
Fl_Type.o: ../FL/fl_utf8.h
Fl_Type.o: ../FL/Fl_Valuator.H
Fl_Type.o: ../FL/Fl_Widget.H
+Fl_Type.o: ../FL/Fl_Wizard.H
Fl_Type.o: ../FL/platform_types.h
Fl_Type.o: ../src/flstring.h
Fl_Type.o: code.h
@@ -725,10 +736,12 @@ Fl_Type.o: file.h
Fl_Type.o: fluid.h
Fl_Type.o: Fluid_Image.h
Fl_Type.o: Fl_Function_Type.h
+Fl_Type.o: Fl_Group_Type.h
Fl_Type.o: Fl_Type.h
Fl_Type.o: Fl_Widget_Type.h
Fl_Type.o: Fl_Window_Type.h
Fl_Type.o: pixmaps.h
+Fl_Type.o: shell_command.h
Fl_Type.o: undo.h
Fl_Type.o: widget_browser.h
Fl_Widget_Type.o: ../config.h
@@ -809,6 +822,7 @@ Fl_Widget_Type.o: Fl_Menu_Type.h
Fl_Widget_Type.o: Fl_Type.h
Fl_Widget_Type.o: Fl_Widget_Type.h
Fl_Widget_Type.o: Fl_Window_Type.h
+Fl_Widget_Type.o: shell_command.h
Fl_Widget_Type.o: Shortcut_Button.h
Fl_Widget_Type.o: StyleParse.h
Fl_Widget_Type.o: widget_browser.h
@@ -873,11 +887,13 @@ Fl_Window_Type.o: ../src/flstring.h
Fl_Window_Type.o: alignment_panel.h
Fl_Window_Type.o: code.h
Fl_Window_Type.o: CodeEditor.h
+Fl_Window_Type.o: factory.h
Fl_Window_Type.o: file.h
Fl_Window_Type.o: fluid.h
Fl_Window_Type.o: Fl_Type.h
Fl_Window_Type.o: Fl_Widget_Type.h
Fl_Window_Type.o: Fl_Window_Type.h
+Fl_Window_Type.o: shell_command.h
Fl_Window_Type.o: Shortcut_Button.h
Fl_Window_Type.o: StyleParse.h
Fl_Window_Type.o: undo.h
@@ -931,6 +947,7 @@ function_panel.o: fluid.h
function_panel.o: Fl_Type.h
function_panel.o: function_panel.h
function_panel.o: pixmaps.h
+function_panel.o: Shortcut_Button.h
function_panel.o: StyleParse.h
function_panel.o: undo.h
function_panel.o: widget_browser.h
@@ -1034,6 +1051,7 @@ shell_command.o: ../FL/Fl_Scrollbar.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.h
shell_command.o: ../FL/Fl_String_class.H
shell_command.o: ../FL/Fl_Tabs.H
shell_command.o: ../FL/Fl_Text_Buffer.H
@@ -1049,6 +1067,61 @@ shell_command.o: alignment_panel.h
shell_command.o: fluid.h
shell_command.o: shell_command.h
shell_command.o: widget_browser.h
+Shortcut_Button.o: ../config.h
+Shortcut_Button.o: ../FL/abi-version.h
+Shortcut_Button.o: ../FL/Enumerations.H
+Shortcut_Button.o: ../FL/filename.H
+Shortcut_Button.o: ../FL/Fl.H
+Shortcut_Button.o: ../FL/Fl_Bitmap.H
+Shortcut_Button.o: ../FL/Fl_Box.H
+Shortcut_Button.o: ../FL/Fl_Browser_.H
+Shortcut_Button.o: ../FL/Fl_Button.H
+Shortcut_Button.o: ../FL/fl_casts.H
+Shortcut_Button.o: ../FL/Fl_Choice.H
+Shortcut_Button.o: ../FL/Fl_Device.H
+Shortcut_Button.o: ../FL/Fl_Double_Window.H
+Shortcut_Button.o: ../FL/fl_draw.H
+Shortcut_Button.o: ../FL/Fl_Export.H
+Shortcut_Button.o: ../FL/Fl_Graphics_Driver.H
+Shortcut_Button.o: ../FL/Fl_Group.H
+Shortcut_Button.o: ../FL/Fl_Image.H
+Shortcut_Button.o: ../FL/Fl_Input.H
+Shortcut_Button.o: ../FL/Fl_Input_.H
+Shortcut_Button.o: ../FL/Fl_Light_Button.H
+Shortcut_Button.o: ../FL/Fl_Menu_.H
+Shortcut_Button.o: ../FL/Fl_Menu_Item.H
+Shortcut_Button.o: ../FL/Fl_Pixmap.H
+Shortcut_Button.o: ../FL/Fl_Plugin.H
+Shortcut_Button.o: ../FL/Fl_Preferences.H
+Shortcut_Button.o: ../FL/Fl_Rect.H
+Shortcut_Button.o: ../FL/Fl_Return_Button.H
+Shortcut_Button.o: ../FL/Fl_RGB_Image.H
+Shortcut_Button.o: ../FL/Fl_Scrollbar.H
+Shortcut_Button.o: ../FL/Fl_Slider.H
+Shortcut_Button.o: ../FL/Fl_Tabs.H
+Shortcut_Button.o: ../FL/Fl_Text_Buffer.H
+Shortcut_Button.o: ../FL/Fl_Text_Display.H
+Shortcut_Button.o: ../FL/Fl_Text_Editor.H
+Shortcut_Button.o: ../FL/Fl_Tile.H
+Shortcut_Button.o: ../FL/fl_types.h
+Shortcut_Button.o: ../FL/fl_utf8.h
+Shortcut_Button.o: ../FL/Fl_Valuator.H
+Shortcut_Button.o: ../FL/Fl_Value_Input.H
+Shortcut_Button.o: ../FL/Fl_Widget.H
+Shortcut_Button.o: ../FL/Fl_Window.H
+Shortcut_Button.o: ../FL/platform.H
+Shortcut_Button.o: ../FL/platform_types.h
+Shortcut_Button.o: ../src/flstring.h
+Shortcut_Button.o: CodeEditor.h
+Shortcut_Button.o: factory.h
+Shortcut_Button.o: fluid.h
+Shortcut_Button.o: Fl_Type.h
+Shortcut_Button.o: Fl_Widget_Type.h
+Shortcut_Button.o: Fl_Window_Type.h
+Shortcut_Button.o: Shortcut_Button.h
+Shortcut_Button.o: StyleParse.h
+Shortcut_Button.o: widget_browser.h
+Shortcut_Button.o: widget_panel.h
StyleParse.o: StyleParse.h
template_panel.o: ../config.h
template_panel.o: ../FL/abi-version.h
@@ -1090,6 +1163,7 @@ undo.o: ../FL/filename.H
undo.o: ../FL/Fl.H
undo.o: ../FL/fl_attr.h
undo.o: ../FL/Fl_Bitmap.H
+undo.o: ../FL/Fl_Browser_.H
undo.o: ../FL/fl_casts.H
undo.o: ../FL/Fl_Device.H
undo.o: ../FL/fl_draw.H
@@ -1104,8 +1178,11 @@ undo.o: ../FL/Fl_Plugin.H
undo.o: ../FL/Fl_Preferences.H
undo.o: ../FL/Fl_Rect.H
undo.o: ../FL/Fl_RGB_Image.H
+undo.o: ../FL/Fl_Scrollbar.H
+undo.o: ../FL/Fl_Slider.H
undo.o: ../FL/fl_types.h
undo.o: ../FL/fl_utf8.h
+undo.o: ../FL/Fl_Valuator.H
undo.o: ../FL/Fl_Widget.H
undo.o: ../FL/platform_types.h
undo.o: ../src/flstring.h
@@ -1113,6 +1190,7 @@ undo.o: file.h
undo.o: fluid.h
undo.o: Fl_Type.h
undo.o: undo.h
+undo.o: widget_browser.h
widget_browser.o: ../FL/abi-version.h
widget_browser.o: ../FL/Enumerations.H
widget_browser.o: ../FL/filename.H
diff --git test/connect.cxx test/connect.cxx
deleted file mode 100644
index d8b84b9..0000000
--- test/connect.cxx
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// PPP example program for the Fast Light Tool Kit (FLTK).
-//
-// Program to make a button to turn a ppp connection on/off.
-// You must chmod +s /usr/sbin/pppd, and put all the options
-// into /etc/ppp/options.
-//
-// Copyright 1998-2010 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
-// file is missing or damaged, see the license at:
-//
-// https://www.fltk.org/COPYING.php
-//
-// Please see the following page on how to report bugs and issues:
-//
-// https://www.fltk.org/bugs.php
-//
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/wait.h>
-
-#include <FL/Fl.H>
-#include <FL/Fl_Window.H>
-#include <FL/Fl_Toggle_Button.H>
-
-int running; // actually the pid
-Fl_Toggle_Button *Button;
-
-void sigchld(int) {
- waitpid(running, 0, 0);
- running = 0;
- Button->value(0);
-}
-
-void cb(Fl_Widget *o, void *) {
- if (((Fl_Toggle_Button*)o)->value()) {
- if (running) return;
- running = fork();
- if (!running) execl("/usr/sbin/pppd","pppd","-detach",0);
- else signal(SIGCHLD, sigchld);
- } else {
- if (!running) return;
- kill(running, SIGINT);
- waitpid(running, 0, 0);
- running = 0;
- }
-}
-
-int main(int argc, char ** argv) {
- Fl_Window window(100,50);
- Fl_Toggle_Button button(0,0,100,50,"Connect");
- Button = &button;
- button.color(1,2);
- button.callback(cb,0);
- window.show(argc,argv);
- return Fl::run();
-}
[ Direct Link to Message ] | |
