Author: matt
Date: 2011-07-31 05:18:37 -0700 (Sun, 31 Jul 2011)
New Revision: 8888
Log:
Converted widget_panel.fl into FLuid3 format.
Modified:
branches/branch-3.0/fluid/Fl_Type.cxx
branches/branch-3.0/fluid/widget_panel.cxx
branches/branch-3.0/fluid/widget_panel.fl
branches/branch-3.0/fluid/widget_panel.h
Modified: branches/branch-3.0/fluid/Fl_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Type.cxx 2011-07-31 11:39:10 UTC (rev
8887)
+++ branches/branch-3.0/fluid/Fl_Type.cxx 2011-07-31 12:18:37 UTC (rev
8888)
@@ -306,7 +306,7 @@
if (l->new_selected)
fltk3::color(fltk3::contrast(fltk3::DARK_GREEN,fltk3::SELECTION_COLOR));
else fltk3::color(fltk3::contrast(fltk3::DARK_GREEN,color()));
fltk3::font(textfont()+fltk3::ITALIC, textsize()-2);
- fltk3::draw(buf, (l->is_parent())?X+12:X, Y+12);
+ fltk3::draw(buf, X+12, Y+12);
Y += comment_incr/2;
comment_incr -= comment_incr/2;
}
Modified: branches/branch-3.0/fluid/widget_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/widget_panel.cxx 2011-07-31 11:39:10 UTC (rev
8887)
+++ branches/branch-3.0/fluid/widget_panel.cxx 2011-07-31 12:18:37 UTC (rev
8888)
@@ -25,7 +25,7 @@
// http://www.fltk.org/str.php
//
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 3.0000
#include "widget_panel.h"
@@ -91,8 +91,15 @@
Fl_Panel* w;
{ Fl_Panel* o = new Fl_Panel(0, 0, 420, 360);
w = o;
+ o->box(fltk3::FLAT_BOX);
+ o->color(fltk3::BACKGROUND_COLOR);
+ o->selection_color(fltk3::BACKGROUND_COLOR);
+ o->labeltype(fltk3::NO_LABEL);
+ o->labelfont(0);
o->labelsize(11);
+ o->labelcolor(fltk3::FOREGROUND_COLOR);
o->align(fltk3::Align(fltk3::ALIGN_CLIP|fltk3::ALIGN_INSIDE));
+ o->when(fltk3::WHEN_RELEASE);
o->hotspot(o);
{ fltk3::TabGroup* o = new fltk3::TabGroup(10, 10, 400, 310);
o->selection_color((fltk3::Color)12);
@@ -104,6 +111,7 @@
o->labelsize(11);
o->callback((fltk3::Callback*)Fl_Panel::propagate_load);
o->when(fltk3::WHEN_NEVER);
+ o->hide();
{ fltk3::Group* o = new fltk3::Group(95, 40, 309, 20, "Label:");
o->labelfont(1);
o->labelsize(11);
@@ -296,8 +304,8 @@
widget_h_input->align(fltk3::Align(fltk3::ALIGN_TOP_LEFT));
} // fltk3::ValueInput* widget_h_input
{ fltk3::LightButton* o = new fltk3::LightButton(335, 150, 55, 20,
"Relative");
- o->tooltip("If set, widgets inside a widget class of type
fltk3::Group are repositioned relat\
-ive to the origin at construction time");
+ o->tooltip("If set, widgets inside a widget class of type
fltk3::Group are repositioned r\
+elative to the origin at construction time");
o->labelsize(11);
o->callback((fltk3::Callback*)wc_relative_cb);
} // fltk3::LightButton* o
@@ -631,7 +639,6 @@
o->labelsize(11);
o->callback((fltk3::Callback*)Fl_Panel::propagate_load);
o->when(fltk3::WHEN_NEVER);
- o->hide();
{ fltk3::Group* o = new fltk3::Group(95, 40, 310, 20, "Class:");
o->labelfont(1);
o->labelsize(11);
Modified: branches/branch-3.0/fluid/widget_panel.fl
===================================================================
--- branches/branch-3.0/fluid/widget_panel.fl 2011-07-31 11:39:10 UTC (rev
8887)
+++ branches/branch-3.0/fluid/widget_panel.fl 2011-07-31 12:18:37 UTC (rev
8888)
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0300
+version 3.0000
header_name {.h}
code_name {.cxx}
comment {//
@@ -31,111 +31,116 @@
} {in_source in_header
}
+decl {\#include "Fl_Type.h"} {
+ comment {Needed for Fl_Panel base class} selected public global
+}
+
Function {make_widget_panel()} {open
} {
- Fl_Window {} {open
- xywh {383 206 420 360} type Double labelsize 11 align 80 resizable hotspot
- code0 {o->size_range(o->w(), o->h());} visible
+ {fltk3::Window} {} {open
+ xywh {562 195 420 360} type Double labelsize 11 align 80 resizable hotspot
+ code0 {o->size_range(o->w(), o->h());}
+ class Fl_Panel visible
} {
- Fl_Tabs {} {
- callback {propagate_load((Fl_Group *)o,v);} open
+ {fltk3::TabGroup} {} {
+ callback {Fl_Panel::propagate_load((fltk3::Group *)o,v);} open
xywh {10 10 400 310} selection_color 12 labelsize 11 labelcolor 7 when 0
resizable
} {
- Fl_Group {} {
+ {fltk3::Group} {} {
label GUI
- callback propagate_load open
- xywh {10 30 400 290} labelsize 11 when 0 resizable
+ callback {Fl_Panel::propagate_load} open
+ xywh {10 30 400 290} labelsize 11 when 0 hide resizable
} {
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Label:}
- callback propagate_load open
+ callback {Fl_Panel::propagate_load} open
xywh {95 40 309 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Input {} {
+ {fltk3::Input} {} {
callback label_cb
tooltip {The label text for the widget.
Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 1
textsize 11 resizable
}
- Fl_Choice {} {
+ {fltk3::Choice} {} {
callback labeltype_cb open
tooltip {The label style for the widget.} xywh {284 40 120 20} box
THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11
- code0 {extern Fl_Menu_Item labeltypemenu[];}
+ code0 {extern fltk3::MenuItem labeltypemenu[];}
code1 {o->menu(labeltypemenu);}
} {}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Image:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 65 309 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Input {} {
+ {fltk3::Input} {} {
callback image_cb
tooltip {The active image for the widget.} xywh {95 65 240 20}
labelfont 1 labelsize 11 textsize 11 resizable
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label {Browse...}
callback image_browse_cb
tooltip {Click to choose the active image.} xywh {334 65 70 20}
labelsize 11
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Inactive:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 90 309 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Input {} {
+ {fltk3::Input} {} {
callback inactive_cb
tooltip {The inactive image for the widget.} xywh {95 90 240 20}
labelfont 1 labelsize 11 textsize 11 resizable
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label {Browse...}
callback inactive_browse_cb
tooltip {Click to choose the inactive image.} xywh {334 90 70 20}
labelsize 11
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Alignment:}
- callback propagate_load open
+ callback {Fl_Panel::propagate_load} open
xywh {95 115 300 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Button {} {
+ {fltk3::Button} {} {
label Clip
- user_data FL_ALIGN_CLIP
+ user_data {fltk3::ALIGN_CLIP}
callback align_cb
tooltip {Clip the label to the inside of the widget.} xywh {95 115
30 20} type Toggle selection_color 8 labelsize 11 align 16
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label Wrap
- user_data FL_ALIGN_WRAP
+ user_data {fltk3::ALIGN_WRAP}
callback align_cb
tooltip {Wrap the label text.} xywh {130 115 30 20} type Toggle
selection_color 8 labelsize 11
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label {@-1<-}
- user_data FL_ALIGN_LEFT
+ user_data {fltk3::ALIGN_LEFT}
callback align_cb
tooltip {Left-align the label.} xywh {270 115 20 20} type Toggle
selection_color 8 labelsize 11 labelcolor 8 hide
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label {@-1->}
- user_data FL_ALIGN_RIGHT
+ user_data {fltk3::ALIGN_RIGHT}
callback align_cb
tooltip {Right-align the label.} xywh {295 115 20 20} type Toggle
selection_color 8 labelsize 11 labelcolor 8 hide
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label {@-18}
- user_data FL_ALIGN_TOP
+ user_data {fltk3::ALIGN_TOP}
callback align_cb
tooltip {Top-align the label.} xywh {320 115 20 20} type Toggle
selection_color 8 labelsize 11 labelcolor 8 hide
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label {@-12}
- user_data FL_ALIGN_BOTTOM
+ user_data {fltk3::ALIGN_BOTTOM}
callback align_cb
tooltip {Bottom-align the label.} xywh {345 115 20 20} type Toggle
selection_color 8 labelsize 11 labelcolor 8 hide
}
- Fl_Choice {} {
- callback align_text_image_cb open selected
+ {fltk3::Choice} {} {
+ callback align_text_image_cb open
xywh {165 115 110 20} down_box BORDER_BOX labelsize 11 textsize 11
} {
MenuItem {} {
@@ -145,31 +150,31 @@
}
MenuItem {} {
label {image over text}
- user_data FL_ALIGN_IMAGE_OVER_TEXT
+ user_data {fltk3::ALIGN_IMAGE_OVER_TEXT}
xywh {25 25 100 20} labelsize 11
}
MenuItem {} {
label {text over image}
- user_data FL_ALIGN_TEXT_OVER_IMAGE
+ user_data {fltk3::ALIGN_TEXT_OVER_IMAGE}
xywh {15 15 100 20} labelsize 11
}
MenuItem {} {
label {text next to image}
- user_data FL_ALIGN_TEXT_NEXT_TO_IMAGE
+ user_data {fltk3::ALIGN_TEXT_NEXT_TO_IMAGE}
xywh {35 35 100 20} labelsize 11
}
MenuItem {} {
label {image next to text}
- user_data FL_ALIGN_IMAGE_NEXT_TO_TEXT
+ user_data {fltk3::ALIGN_IMAGE_NEXT_TO_TEXT}
xywh {45 45 100 20} labelsize 11
}
MenuItem {} {
label {image is backdrop}
- user_data FL_ALIGN_IMAGE_BACKDROP
+ user_data {fltk3::ALIGN_IMAGE_BACKDROP}
xywh {55 55 100 20} labelsize 11
}
}
- Fl_Choice {} {
+ {fltk3::Choice} {} {
callback align_position_cb open
xywh {280 115 85 20} down_box BORDER_BOX labelsize 11 textsize 11
} {
@@ -180,47 +185,47 @@
}
MenuItem {} {
label {top left}
- user_data FL_ALIGN_TOP_LEFT
+ user_data {fltk3::ALIGN_TOP_LEFT}
xywh {45 45 100 20} labelsize 11
}
MenuItem {} {
label top
- user_data FL_ALIGN_TOP
+ user_data {fltk3::ALIGN_TOP}
xywh {55 55 100 20} labelsize 11
}
MenuItem {} {
label {top right}
- user_data FL_ALIGN_TOP_RIGHT
+ user_data {fltk3::ALIGN_TOP_RIGHT}
xywh {65 65 100 20} labelsize 11
}
MenuItem {} {
label left
- user_data FL_ALIGN_LEFT
+ user_data {fltk3::ALIGN_LEFT}
xywh {75 75 100 20} labelsize 11
}
MenuItem {} {
label center
- user_data FL_ALIGN_CENTER
+ user_data {fltk3::ALIGN_CENTER}
xywh {35 35 100 20} labelsize 11
}
MenuItem {} {
label right
- user_data FL_ALIGN_RIGHT
+ user_data {fltk3::ALIGN_RIGHT}
xywh {85 85 100 20} labelsize 11
}
MenuItem {} {
label {bottom left}
- user_data FL_ALIGN_BOTTOM_LEFT
+ user_data {fltk3::ALIGN_BOTTOM_LEFT}
xywh {95 95 100 20} labelsize 11
}
MenuItem {} {
label bottom
- user_data FL_ALIGN_BOTTOM
+ user_data {fltk3::ALIGN_BOTTOM}
xywh {105 105 100 20} labelsize 11
}
MenuItem {} {
label {bottom right}
- user_data FL_ALIGN_BOTTOM_RIGHT
+ user_data {fltk3::ALIGN_BOTTOM_RIGHT}
xywh {115 115 100 20} labelsize 11 divider
}
MenuItem {} {
@@ -230,327 +235,327 @@
}
MenuItem {} {
label {left top}
- user_data FL_ALIGN_LEFT_TOP
+ user_data {fltk3::ALIGN_LEFT_TOP}
xywh {135 135 100 20} labelsize 11
}
MenuItem {} {
label {right top}
- user_data FL_ALIGN_RIGHT_TOP
+ user_data {fltk3::ALIGN_RIGHT_TOP}
xywh {145 145 100 20} labelsize 11
}
MenuItem {} {
label {left bottom}
- user_data FL_ALIGN_LEFT_BOTTOM
+ user_data {fltk3::ALIGN_LEFT_BOTTOM}
xywh {155 155 100 20} labelsize 11
}
MenuItem {} {
label {right bottom}
- user_data FL_ALIGN_RIGHT_BOTTOM
+ user_data {fltk3::ALIGN_RIGHT_BOTTOM}
xywh {45 45 100 20} labelsize 11
}
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label {@-3square}
- user_data FL_ALIGN_INSIDE
+ user_data {fltk3::ALIGN_INSIDE}
callback align_cb
tooltip {Show the label inside the widget.} xywh {370 115 20 20}
type Toggle selection_color 8 labelsize 11 labelcolor 8
}
- Fl_Box {} {
+ {fltk3::Box} {} {
xywh {395 115 0 20} labelsize 11 resizable
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Position:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 150 300 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Value_Input widget_x_input {
+ {fltk3::ValueInput} widget_x_input {
label {X:}
callback x_cb
tooltip {The X position of the widget.} xywh {95 150 55 20}
labelsize 11 align 5 maximum 2048 step 1 textsize 11
}
- Fl_Value_Input widget_y_input {
+ {fltk3::ValueInput} widget_y_input {
label {Y:}
callback y_cb
tooltip {The Y position of the widget.} xywh {155 150 55 20}
labelsize 11 align 5 maximum 2048 step 1 textsize 11
}
- Fl_Value_Input widget_w_input {
+ {fltk3::ValueInput} widget_w_input {
label {Width:}
callback w_cb
tooltip {The width of the widget.} xywh {215 150 55 20} labelsize
11 align 5 maximum 2048 step 1 textsize 11
}
- Fl_Value_Input widget_h_input {
+ {fltk3::ValueInput} widget_h_input {
label {Height:}
callback h_cb
tooltip {The height of the widget.} xywh {275 150 55 20} labelsize
11 align 5 maximum 2048 step 1 textsize 11
}
- Fl_Light_Button {} {
+ {fltk3::LightButton} {} {
label Relative
callback wc_relative_cb
- tooltip {If set, widgets inside a widget class of type Fl_Group
are repositioned relative to the origin at construction time} xywh {335 150 55
20} labelsize 11
+ tooltip {If set, widgets inside a widget class of type
fltk3::Group are repositioned relative to the origin at construction time} xywh
{335 150 55 20} labelsize 11
}
- Fl_Box {} {
+ {fltk3::Box} {} {
xywh {394 150 1 20} resizable
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Values:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 185 300 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Value_Input {} {
+ {fltk3::ValueInput} {} {
label {Size:}
callback slider_size_cb
tooltip {The size of the slider.} xywh {95 185 55 20} labelsize 11
align 5 step 0.010101 textsize 11
}
- Fl_Value_Input {} {
+ {fltk3::ValueInput} {} {
label {Minimum:}
callback min_cb
tooltip {The minimum value of the widget.} xywh {155 185 55 20}
labelsize 11 align 5 textsize 11
}
- Fl_Value_Input {} {
+ {fltk3::ValueInput} {} {
label {Maximum:}
callback max_cb
tooltip {The maximum value of the widget.} xywh {215 185 55 20}
labelsize 11 align 5 value 1 textsize 11
}
- Fl_Value_Input {} {
+ {fltk3::ValueInput} {} {
label {Step:}
callback step_cb
tooltip {The resolution of the widget value.} xywh {275 185 55 20}
labelsize 11 align 5 textsize 11
}
- Fl_Value_Input {} {
+ {fltk3::ValueInput} {} {
label {Value:}
callback value_cb
tooltip {The current widget value.} xywh {335 185 55 20} labelsize
11 align 5 textsize 11
}
- Fl_Box {} {
+ {fltk3::Box} {} {
xywh {395 185 0 20} resizable
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Size Range:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 185 300 20} labelfont 1 labelsize 11 align 4 hide
} {
- Fl_Value_Input {} {
+ {fltk3::ValueInput} {} {
label {Minimum Size:}
callback min_w_cb
tooltip {The size of the slider.} xywh {95 185 55 20} labelsize 11
align 5 maximum 2048 step 1 textsize 11
}
- Fl_Value_Input {} {
+ {fltk3::ValueInput} {} {
callback min_h_cb
tooltip {The minimum value of the widget.} xywh {155 185 55 20}
labelsize 11 align 5 maximum 2048 step 1 textsize 11
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label set
callback set_min_size_cb
xywh {215 185 25 20} labelsize 11
}
- Fl_Value_Input {} {
+ {fltk3::ValueInput} {} {
label {Maximum Size:}
callback max_w_cb
tooltip {The maximum value of the widget.} xywh {245 185 55 20}
labelsize 11 align 5 maximum 2048 step 1 textsize 11
}
- Fl_Value_Input {} {
+ {fltk3::ValueInput} {} {
callback max_h_cb
tooltip {The resolution of the widget value.} xywh {305 185 55 20}
labelsize 11 align 5 maximum 2048 step 1 textsize 11
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label set
callback set_max_size_cb
xywh {365 185 25 20} labelsize 11
}
- Fl_Box {} {
+ {fltk3::Box} {} {
xywh {395 185 0 20} resizable
}
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label {Shortcut:}
callback shortcut_in_cb
tooltip {The shortcut key for the widget.} xywh {95 210 310 20} box
DOWN_BOX color 7 selection_color 7 labelfont 1 labelsize 11 align 4
code0 {\#include "Shortcut_Button.h"}
class Shortcut_Button
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {X Class:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 235 300 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Input {} {
+ {fltk3::Input} {} {
label {:}
callback xclass_cb
tooltip {The X resource class.} xywh {95 235 95 20} labelfont 1
labelsize 11 textsize 11 resizable
}
- Fl_Light_Button {} {
+ {fltk3::LightButton} {} {
label Border
callback border_cb
tooltip {Add a border around the window.} xywh {195 235 60 20}
selection_color 1 labelsize 11
}
- Fl_Light_Button {} {
+ {fltk3::LightButton} {} {
label Modal
callback modal_cb
tooltip {Make the window modal.} xywh {260 235 55 20}
selection_color 1 labelsize 11
}
- Fl_Light_Button {} {
+ {fltk3::LightButton} {} {
label Nonmodal
callback non_modal_cb
tooltip {Make the window non-modal.} xywh {320 235 75 20}
selection_color 1 labelsize 11 align 148
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Attributes:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 260 305 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Light_Button {} {
+ {fltk3::LightButton} {} {
label Visible
callback visible_cb
tooltip {Show the widget.} xywh {95 260 60 20} selection_color 1
labelsize 11
}
- Fl_Light_Button {} {
+ {fltk3::LightButton} {} {
label Active
callback active_cb
tooltip {Activate the widget.} xywh {160 260 60 20}
selection_color 1 labelsize 11
}
- Fl_Light_Button {} {
+ {fltk3::LightButton} {} {
label Resizable
callback resizable_cb
tooltip {Make the widget resizable.} xywh {225 260 75 20}
selection_color 1 labelsize 11 when 1
}
- Fl_Light_Button {} {
+ {fltk3::LightButton} {} {
label Hotspot
callback hotspot_cb
tooltip {Center the window under this widget.} xywh {305 260 70
20} selection_color 1 labelsize 11 when 1
}
- Fl_Box {} {
+ {fltk3::Box} {} {
xywh {395 260 0 20} labelsize 11 resizable
}
}
- Fl_Input {} {
+ {fltk3::Input} {} {
label {Tooltip:}
callback tooltip_cb
tooltip {The tooltip text for the widget.
Use Ctrl-J for newlines.} xywh {95 285 310 20} labelfont 1 labelsize 11
textsize 11
}
- Fl_Box {} {
+ {fltk3::Box} {} {
xywh {95 305 300 5} labelsize 11 resizable
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label Style
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {10 30 400 290} labelsize 11 when 0 hide
} {
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Label Font:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 40 309 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Choice {} {
+ {fltk3::Choice} {} {
callback labelfont_cb open
tooltip {The style of the label text.} xywh {95 40 170 20} box
THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11 resizable
- code0 {extern Fl_Menu_Item fontmenu[];}
+ code0 {extern fltk3::MenuItem fontmenu[];}
code1 {o->menu(fontmenu);}
} {}
- Fl_Value_Input {} {
+ {fltk3::ValueInput} {} {
callback labelsize_cb
tooltip {The size of the label text.} xywh {264 40 50 20}
labelsize 11 maximum 100 step 1 value 14 textsize 11
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label {Label Color}
callback labelcolor_cb
tooltip {The color of the label text.} xywh {314 40 90 20}
labelsize 11
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Box:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 65 309 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Choice {} {
+ {fltk3::Choice} {} {
callback box_cb open
tooltip {The "up" box of the widget.} xywh {95 65 219 20} box
THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11 resizable
- code0 {extern Fl_Menu_Item boxmenu[];}
+ code0 {extern fltk3::MenuItem boxmenu[];}
code1 {o->menu(boxmenu);}
} {}
- Fl_Button {} {
+ {fltk3::Button} {} {
label Color
callback color_cb
tooltip {The background color of the widget.} xywh {314 65 90 20}
labelsize 11
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Down Box:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 90 309 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Choice {} {
+ {fltk3::Choice} {} {
callback down_box_cb open
tooltip {The "down" box of the widget.} xywh {95 90 219 20} box
THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11 resizable
- code0 {extern Fl_Menu_Item boxmenu[];}
+ code0 {extern fltk3::MenuItem boxmenu[];}
code1 {o->menu(boxmenu);}
} {}
- Fl_Button {} {
+ {fltk3::Button} {} {
label {Select Color}
callback color2_cb
tooltip {The selection color of the widget.} xywh {314 90 90 20}
labelsize 11
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Text Font:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 115 309 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Choice {} {
+ {fltk3::Choice} {} {
callback textfont_cb open
tooltip {The value text style.} xywh {95 115 170 20} box DOWN_BOX
down_box BORDER_BOX labelfont 1 labelsize 11 textsize 11 resizable
- code0 {extern Fl_Menu_Item fontmenu[];}
+ code0 {extern fltk3::MenuItem fontmenu[];}
code1 {o->menu(fontmenu);}
} {}
- Fl_Value_Input {} {
+ {fltk3::ValueInput} {} {
callback textsize_cb
tooltip {The value text size.} xywh {264 115 50 20} labelsize 11
maximum 100 step 1 value 14 textsize 11
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label {Text Color}
callback textcolor_cb
tooltip {The value text color.} xywh {314 115 90 20} labelsize 11
}
}
- Fl_Box {} {
+ {fltk3::Box} {} {
xywh {95 140 300 40} labelsize 11 resizable
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {C++}
- callback propagate_load open
- xywh {10 30 400 290} labelsize 11 when 0 hide
+ callback {Fl_Panel::propagate_load} open
+ xywh {10 30 400 290} labelsize 11 when 0
} {
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Class:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 40 310 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Input {} {
+ {fltk3::Input} {} {
user_data 4
callback subclass_cb
tooltip {The widget subclass.} xywh {95 40 172 20} labelfont 1
labelsize 11 textfont 4 textsize 11 resizable
}
- Fl_Choice {} {
+ {fltk3::Choice} {} {
callback subtype_cb open
tooltip {The widget subtype.} xywh {265 40 140 20} box THIN_UP_BOX
down_box BORDER_BOX labelsize 11 textsize 11
} {}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Name:}
- callback propagate_load open
+ callback {Fl_Panel::propagate_load} open
xywh {95 65 310 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Input {} {
+ {fltk3::Input} {} {
callback name_cb
tooltip {The name of the widget.} xywh {95 65 235 20} labelfont 1
labelsize 11 textsize 11 resizable
}
- Fl_Choice {} {
+ {fltk3::Choice} {} {
callback name_public_member_cb open
tooltip {Change member access attribute.} xywh {330 65 75 20}
down_box BORDER_BOX labelsize 11 when 1 textsize 11
} {
@@ -570,7 +575,7 @@
xywh {0 0 100 20} labelsize 11
}
}
- Fl_Choice {} {
+ {fltk3::Choice} {} {
callback name_public_cb open
tooltip {Change widget accessibility.} xywh {330 65 75 20}
down_box BORDER_BOX labelsize 11 when 1 textsize 11
} {
@@ -586,61 +591,61 @@
}
}
}
- Fl_Input {v_input[0]} {
+ {fltk3::Input} {v_input[0]} {
label {Extra Code:}
user_data 0
callback v_input_cb
tooltip {Extra initialization code for the widget.} xywh {95 90 310
20} labelfont 1 labelsize 11 textfont 4 textsize 11
}
- Fl_Input {v_input[1]} {
+ {fltk3::Input} {v_input[1]} {
user_data 1
callback v_input_cb
tooltip {Extra initialization code for the widget.} xywh {95 110 310
20} labelsize 11 textfont 4 textsize 11
}
- Fl_Input {v_input[2]} {
+ {fltk3::Input} {v_input[2]} {
user_data 2
callback v_input_cb
tooltip {Extra initialization code for the widget.} xywh {95 130 310
20} labelsize 11 textfont 4 textsize 11
}
- Fl_Input {v_input[3]} {
+ {fltk3::Input} {v_input[3]} {
user_data 3
callback v_input_cb
tooltip {Extra initialization code for the widget.} xywh {95 150 310
20} labelsize 11 textfont 4 textsize 11
}
- Fl_Text_Editor {} {
+ {fltk3::TextEditor} {} {
label {Callback:}
callback callback_cb
tooltip {The callback function or code for the widget. Use the
variable name 'o' to access the Widget pointer and 'v' to access the user
value.} xywh {95 175 310 90} box DOWN_BOX labelfont 1 labelsize 11 align 4
textfont 4 textsize 11 resizable
code0 {\#include "CodeEditor.h"}
class CodeEditor
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {User Data:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 270 310 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Input {} {
+ {fltk3::Input} {} {
callback user_data_cb
tooltip {The user data to pass into the callback code.} xywh {95
270 158 20} labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
}
- Fl_Choice {} {
+ {fltk3::Choice} {} {
label {When:}
callback when_cb open
tooltip {When to call the callback function.} xywh {300 270 105
20} box THIN_UP_BOX down_box BORDER_BOX labelfont 1 labelsize 11 when 1
textsize 11
- code0 {extern Fl_Menu_Item whenmenu[];}
+ code0 {extern fltk3::MenuItem whenmenu[];}
code1 {o->menu(whenmenu);}
} {}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Type:}
- callback propagate_load
+ callback {Fl_Panel::propagate_load} open
xywh {95 295 310 20} labelfont 1 labelsize 11 align 4
} {
- Fl_Input {} {
+ {fltk3::Input} {} {
callback user_data_type_cb
tooltip {The type of the user data.} xywh {95 295 158 20}
labelfont 1 labelsize 11 textfont 4 textsize 11 resizable
}
- Fl_Light_Button {} {
+ {fltk3::LightButton} {} {
label {No Change}
callback when_button_cb
tooltip {Call the callback even if the value has not changed.}
xywh {300 295 105 20} selection_color 1 labelsize 11
@@ -648,33 +653,33 @@
}
}
}
- Fl_Group {} {open
+ {fltk3::Group} {} {open
xywh {9 330 400 20} labelsize 11
} {
- Fl_Box {} {
+ {fltk3::Box} {} {
xywh {9 330 20 20} labelsize 11 resizable
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label {Hide &Overlays}
callback overlay_cb
tooltip {Hide the widget overlay box.} xywh {240 330 99 20} labelsize
11 labelcolor 1
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label Revert
callback revert_cb
xywh {66 330 80 20} labelsize 11 hide
}
- Fl_Return_Button {} {
+ {fltk3::ReturnButton} {} {
label Close
callback ok_cb
xywh {344 330 64 20} labelsize 11
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label Cancel
callback cancel_cb
xywh {339 330 70 20} labelsize 11 hide
}
- Fl_Button wLiveMode {
+ {fltk3::Button} wLiveMode {
label {Live &Mode}
callback live_mode_cb
tooltip {Create a live duplicate of the selected widgets to test
resizing and menu behavior.} xywh {151 330 84 20} type Toggle labelsize 11
Modified: branches/branch-3.0/fluid/widget_panel.h
===================================================================
--- branches/branch-3.0/fluid/widget_panel.h 2011-07-31 11:39:10 UTC (rev
8887)
+++ branches/branch-3.0/fluid/widget_panel.h 2011-07-31 12:18:37 UTC (rev
8888)
@@ -25,13 +25,15 @@
// http://www.fltk.org/str.php
//
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 3.0000
#ifndef widget_panel_h
#define widget_panel_h
+#include <fltk3/run.h>
+/**
+ Needed for Fl_Panel base class
+*/
#include "Fl_Type.h"
-#include <fltk3/run.h>
-#include <fltk3/DoubleWindow.h>
#include <fltk3/TabGroup.h>
#include <fltk3/Group.h>
#include <fltk3/Input.h>
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
