Author: matt
Date: 2011-05-23 08:39:23 -0700 (Mon, 23 May 2011)
New Revision: 8721
Log:
123: first Fluid based project converted: 'radio'
Modified:
branches/branch-3.0/fluid/Fl_Widget_Type.cxx
branches/branch-3.0/test/radio.fl
Modified: branches/branch-3.0/fluid/Fl_Widget_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Widget_Type.cxx 2011-05-23 08:24:53 UTC
(rev 8720)
+++ branches/branch-3.0/fluid/Fl_Widget_Type.cxx 2011-05-23 15:39:23 UTC
(rev 8721)
@@ -2517,10 +2517,10 @@
x += pasteoffset;
y += pasteoffset;
// FIXME temporary change!
- if (read_version>=2.0 && o->parent() && o->parent()!=o->window()) {
- x += o->parent()->x();
- y += o->parent()->y();
- }
+ //if (read_version>=2.0 && o->parent() && o->parent()!=o->window()) {
+ // x += o->parent()->x();
+ // y += o->parent()->y();
+ //}
o->resize(x,y,w,h);
}
} else if (!strcmp(c,"tooltip")) {
Modified: branches/branch-3.0/test/radio.fl
===================================================================
--- branches/branch-3.0/test/radio.fl 2011-05-23 08:24:53 UTC (rev 8720)
+++ branches/branch-3.0/test/radio.fl 2011-05-23 15:39:23 UTC (rev 8721)
@@ -1,99 +1,98 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0300
+version 3.0000
header_name {.h}
code_name {.cxx}
-Function {button_cb(Fl_Button *b, void *)} {
+Function {button_cb(fltk3::Button *b, void *)} {
comment {Buttons test callback} open private return_type void
} {
code {char msg[256];
sprintf(msg, "Label: '%s'\\nValue: %d", b->label(),b->value());
cb_info->value(msg);
cb_info->redraw();
-printf("%s\\n",msg);} {selected
- }
+printf("%s\\n",msg);} {}
}
Function {} {open
} {
- Fl_Window {} {open
- xywh {463 67 369 214} type Double visible
+ {fltk3::Window} {} {open
+ xywh {464 299 369 214} type Double visible
} {
- Fl_Button {} {
- label {&Fl_Button A1}
+ {fltk3::Button} {} {
+ label {&fltk3::Button A1}
tooltip {Normal button (callback called only when released)} xywh {20 10
160 30} labelsize 13
- code0 {o->callback((Fl_Callback*) button_cb);}
+ code0 {o->callback((fltk3::Callback*) button_cb);}
}
- Fl_Button {} {
- label {Fl_Button &A2}
+ {fltk3::Button} {} {
+ label {fltk3::Button &A2}
tooltip {Normal button with callback called when changed (push and
released)} xywh {20 44 160 30} labelsize 13 when 1
- code0 {o->callback((Fl_Callback*) button_cb);}
+ code0 {o->callback((fltk3::Callback*) button_cb);}
}
- Fl_Return_Button {} {
- label {Fl_Return_Button &B}
+ {fltk3::ReturnButton} {} {
+ label {fltk3::ReturnButton &B}
tooltip {Button with Return key as default shortcut} xywh {20 78 160 30}
labelsize 13
- code0 {o->callback((Fl_Callback*) button_cb);}
+ code0 {o->callback((fltk3::Callback*) button_cb);}
}
- Fl_Light_Button {} {
- label {Fl_Light_Button &C}
+ {fltk3::LightButton} {} {
+ label {fltk3::LightButton &C}
tooltip {Button with toggle state and a visual indicator of the current
state} xywh {20 113 160 30} labelsize 13
- code0 {o->callback((Fl_Callback*) button_cb);}
+ code0 {o->callback((fltk3::Callback*) button_cb);}
}
- Fl_Check_Button {} {
- label {Fl_Check_Button &D}
+ {fltk3::CheckButton} {} {
+ label {fltk3::CheckButton &D}
tooltip {Check button with toggle state} xywh {20 148 160 30} down_box
DOWN_BOX labelsize 13
- code0 {o->callback((Fl_Callback*) button_cb);}
+ code0 {o->callback((fltk3::Callback*) button_cb);}
}
- Fl_Round_Button {} {
- label {Fl_Round_Button &E}
+ {fltk3::RoundButton} {} {
+ label {fltk3::RoundButton &E}
tooltip {Round Button with toggle state} xywh {20 178 160 30} down_box
ROUND_DOWN_BOX labelsize 13
- code0 {o->callback((Fl_Callback*) button_cb);}
+ code0 {o->callback((fltk3::Callback*) button_cb);}
}
- Fl_Group {} {open
+ {fltk3::Group} {} {open
xywh {190 10 70 120} box THIN_UP_FRAME
} {
- Fl_Round_Button {} {
+ {fltk3::RoundButton} {} {
label {radio &1}
tooltip {Radio button, only one button is set at a time, in the
corresponding group.} xywh {190 10 70 30} type Radio down_box ROUND_DOWN_BOX
- code0 {o->callback((Fl_Callback*) button_cb);}
+ code0 {o->callback((fltk3::Callback*) button_cb);}
}
- Fl_Round_Button {} {
+ {fltk3::RoundButton} {} {
label {radio &2}
tooltip {Radio button, only one button is set at a time, in the
corresponding group.} xywh {190 40 70 30} type Radio down_box ROUND_DOWN_BOX
- code0 {o->callback((Fl_Callback*) button_cb);}
+ code0 {o->callback((fltk3::Callback*) button_cb);}
}
- Fl_Round_Button {} {
+ {fltk3::RoundButton} {} {
label {radio &3}
tooltip {Radio button, only one button is set at a time, in the
corresponding group.} xywh {190 70 70 30} type Radio down_box ROUND_DOWN_BOX
- code0 {o->callback((Fl_Callback*) button_cb);}
+ code0 {o->callback((fltk3::Callback*) button_cb);}
}
- Fl_Round_Button {} {
+ {fltk3::RoundButton} {} {
label {radio &4}
tooltip {Radio button, only one button is set at a time, in the
corresponding group.} xywh {190 100 70 30} type Radio down_box ROUND_DOWN_BOX
- code0 {o->callback((Fl_Callback*) button_cb);}
+ code0 {o->callback((fltk3::Callback*) button_cb);}
}
}
- Fl_Group {} {open
+ {fltk3::Group} {} {open
xywh {270 10 90 120} box THIN_UP_BOX
} {
- Fl_Button {} {
+ {fltk3::Button} {} {
label radio
tooltip {Custom look button, only one button is set at a time, in the
corresponding group.} xywh {280 20 20 20} type Radio selection_color 1 align 8
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label radio
tooltip {Custom look button, only one button is set at a time, in the
corresponding group.} xywh {280 45 20 20} type Radio selection_color 1 align 8
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label radio
tooltip {Custom look button, only one button is set at a time, in the
corresponding group.} xywh {280 70 20 20} type Radio selection_color 1 align 8
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label radio
tooltip {Custom look button, only one button is set at a time, in the
corresponding group.} xywh {280 95 20 20} type Radio selection_color 1 align 8
}
}
- Fl_Output cb_info {
- label {callback:}
+ {fltk3::Output} cb_info {
+ label {callback:} selected
xywh {190 148 170 62} type Multiline align 133 textsize 12
}
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
