From 2e9ba0a10e313a37a368e5b90923f6449e1621e7 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Tue, 1 May 2018 10:58:16 +0000 Subject: [PATCH] Update fluid (.fl) files. src/Fl_Help_Dialog.fl: Add one missing declaration. Other files: update (fluid -u) and update source (fluid -c). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12887 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fluid/widget_panel.fl | 4 ++-- src/Fl_Help_Dialog.fl | 5 ++++- test/tree.fl | 2 +- test/valuators.fl | 16 ++++++++-------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl index 031367bfe..dcc89017e 100644 --- a/fluid/widget_panel.fl +++ b/fluid/widget_panel.fl @@ -30,8 +30,8 @@ Function {make_widget_panel()} { } { Fl_Window {} { comment {Use a Double Window to avoid flickering.} open - xywh {560 60 420 400} type Double labelsize 11 align 80 resizable hotspot - code0 {o->size_range(o->w(), o->h());} size_range {420 400 0 0} visible + xywh {560 60 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} } { Fl_Tabs {} { callback {propagate_load((Fl_Group *)o,v);} open diff --git a/src/Fl_Help_Dialog.fl b/src/Fl_Help_Dialog.fl index 94727620d..2eb8efebc 100644 --- a/src/Fl_Help_Dialog.fl +++ b/src/Fl_Help_Dialog.fl @@ -29,6 +29,9 @@ comment {// } {in_source in_header } +decl {\#include } {selected private local +} + decl {\#include "flstring.h"} {private local } @@ -53,7 +56,7 @@ class FL_EXPORT Fl_Help_Dialog {open label {Help Dialog} open private xywh {398 64 530 385} type Double hide resizable size_range {260 150 0 0} } { - Fl_Group {} {open selected + Fl_Group {} {open xywh {10 10 511 25} } { Fl_Button back_ { diff --git a/test/tree.fl b/test/tree.fl index 756993f80..efb19faf7 100644 --- a/test/tree.fl +++ b/test/tree.fl @@ -362,7 +362,7 @@ Function {} {open } { Fl_Window window { label tree open - xywh {539 25 1045 730} type Double visible + xywh {539 25 1045 730} type Double hide } { Fl_Group tree { label Tree diff --git a/test/valuators.fl b/test/valuators.fl index b2a593b45..3911f44fc 100644 --- a/test/valuators.fl +++ b/test/valuators.fl @@ -1,16 +1,16 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 -header_name {.h} +version 1.0400 +header_name {.h} code_name {.cxx} decl {\#include } {public global -} +} Function {} {open } { Fl_Window {} { label {Valuator classes, showing values for type()} open - xywh {400 199 580 640} type Double color 43 selection_color 43 - code0 {\#include } visible + xywh {400 199 580 640} type Double color 43 selection_color 43 hide + code0 {\#include } } { Fl_Box {} { label Fl_Slider @@ -227,14 +227,14 @@ Function {} {open class Fl_Simple_Terminal } } -} +} Function {callback(Fl_Widget* o, void*)} {open return_type void } { code {const char *name = (const char*)(o->user_data() ? o->user_data() : "???"); tty->printf("callback(): %s value() = \\033[2m%g\\033[0m\\n", name, ((Fl_Valuator*)o)->value());} {} -} +} Function {callback_spinner(Fl_Widget* o, void*)} { comment {Spinner doesn't derive from Fl_Valuator..} open return_type void @@ -242,4 +242,4 @@ Function {callback_spinner(Fl_Widget* o, void*)} { code {const char *name = (const char*)(o->user_data() ? o->user_data() : "???"); tty->printf("callback(): %s value() = \\033[2m%g\\033[0m\\n", name, ((Fl_Spinner*)o)->value());} {} -} +}