diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx index 55548a015..ce28b56a4 100644 --- a/fluid/widget_panel.cxx +++ b/fluid/widget_panel.cxx @@ -738,8 +738,9 @@ access the Widget pointer and \'v\' to access the user value."); o->callback((Fl_Callback*)cancel_cb); o->hide(); } - { Fl_Button* o = wLiveMode = new Fl_Button(142, 325, 84, 20, "LIve &Mode"); - o->tooltip("Hide the widget overlay box."); + { Fl_Button* o = wLiveMode = new Fl_Button(142, 325, 84, 20, "Live &Mode"); + o->tooltip("Create a live duplicate of the selected widgets to test resizing and menu beh\ +avior."); o->type(1); o->labelsize(11); o->labelcolor(FL_FOREGROUND_COLOR); diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl index 610f6f69d..e4772a8a5 100644 --- a/fluid/widget_panel.fl +++ b/fluid/widget_panel.fl @@ -510,7 +510,7 @@ Function {make_widget_panel()} {open } Fl_Button {} { label {Hide &Overlays} - callback overlay_cb selected + callback overlay_cb tooltip {Hide the widget overlay box.} xywh {231 325 99 20} labelsize 11 labelcolor 1 } Fl_Button {} { @@ -529,9 +529,9 @@ Function {make_widget_panel()} {open xywh {329 325 70 20} labelsize 11 hide } Fl_Button wLiveMode { - label {LIve &Mode} - callback live_mode_cb - tooltip {Hide the widget overlay box.} xywh {142 325 84 20} type Toggle labelsize 11 labelcolor 0 + label {Live &Mode} + callback live_mode_cb selected + tooltip {Create a live duplicate of the selected widgets to test resizing and menu behavior.} xywh {142 325 84 20} type Toggle labelsize 11 labelcolor 0 } } } diff --git a/test/hello.cxx b/test/hello.cxx index 178d52934..4778a20f6 100644 --- a/test/hello.cxx +++ b/test/hello.cxx @@ -1,45 +1,92 @@ -// -// "$Id$" -// -// Hello, World! program for the Fast Light Tool Kit (FLTK). -// -// Copyright 1998-2005 by Bill Spitzak and others. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -// USA. -// -// Please report all bugs and problems on the following page: -// -// http://www.fltk.org/str.php -// +// generated by Fast Light User Interface Designer (fluid) version 1.0107 +// generated by Fast Light User Interface Designer (fluid) version 1.0107 + +#ifndef test_h +#define test_h #include -#include -#include +#include +#include -int main(int argc, char **argv) { - Fl_Window *window = new Fl_Window(300,180); - Fl_Box *box = new Fl_Box(FL_UP_BOX,20,40,260,100,"Hello, World!"); - box->labelfont(FL_BOLD+FL_ITALIC); - box->labelsize(36); - box->labeltype(FL_SHADOW_LABEL); - window->end(); - window->show(argc, argv); - return Fl::run(); +class Composite : public Fl_Group { +public: + Composite(int X, int Y, int W, int H, const char *L = 0); +}; +#include +#endif + +Composite::Composite(int X, int Y, int W, int H, const char *L) + : Fl_Group(X, Y, W, H, L) { + Composite *o = this; + o->position(0, 0); +o->box(FL_FLAT_BOX); +o->color(FL_BACKGROUND_COLOR); +o->selection_color(FL_BACKGROUND_COLOR); +o->labeltype(FL_NO_LABEL); +o->labelfont(0); +o->labelsize(14); +o->labelcolor(FL_BLACK); +o->align(FL_ALIGN_TOP); +o->when(FL_WHEN_RELEASE); +new Fl_Button(25, 25, 50, 50, "@circle"); +o->position(X, Y); +end(); } -// -// End of "$Id$". -// +int main(int argc, char **argv) { + Fl_Double_Window* w; + { Fl_Double_Window* o = new Fl_Double_Window(200, 200, "Widget class test"); + w = o; + { Composite* o = new Composite(0, 0, 100, 100, "top left"); + o->box(FL_EMBOSSED_FRAME); + o->color(FL_BACKGROUND_COLOR); + o->selection_color(FL_BACKGROUND_COLOR); + o->labeltype(FL_NORMAL_LABEL); + o->labelfont(0); + o->labelsize(14); + o->labelcolor(FL_BLACK); + o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE); + o->when(FL_WHEN_RELEASE); + o->end(); + } + { Composite* o = new Composite(100, 0, 100, 100, "top right"); + o->box(FL_EMBOSSED_FRAME); + o->color(FL_BACKGROUND_COLOR); + o->selection_color(FL_BACKGROUND_COLOR); + o->labeltype(FL_NORMAL_LABEL); + o->labelfont(0); + o->labelsize(14); + o->labelcolor(FL_BLACK); + o->align(FL_ALIGN_TOP_RIGHT|FL_ALIGN_INSIDE); + o->when(FL_WHEN_RELEASE); + o->end(); + } + { Composite* o = new Composite(0, 100, 100, 100, "bottom left"); + o->box(FL_EMBOSSED_FRAME); + o->color(FL_BACKGROUND_COLOR); + o->selection_color(FL_BACKGROUND_COLOR); + o->labeltype(FL_NORMAL_LABEL); + o->labelfont(0); + o->labelsize(14); + o->labelcolor(FL_BLACK); + o->align(FL_ALIGN_BOTTOM_LEFT|FL_ALIGN_INSIDE); + o->when(FL_WHEN_RELEASE); + o->end(); + } + { Composite* o = new Composite(100, 100, 100, 100, "bottom right"); + o->box(FL_EMBOSSED_FRAME); + o->color(FL_BACKGROUND_COLOR); + o->selection_color(FL_BACKGROUND_COLOR); + o->labeltype(FL_NORMAL_LABEL); + o->labelfont(0); + o->labelsize(14); + o->labelcolor(FL_BLACK); + o->align(FL_ALIGN_BOTTOM_RIGHT|FL_ALIGN_INSIDE); + o->when(FL_WHEN_RELEASE); + o->end(); + } + o->end(); + } + w->show(argc, argv); + return Fl::run(); +}