Author: matt
Date: 2012-05-08 00:08:16 -0700 (Tue, 08 May 2012)
New Revision: 9458
Log:
Fixed removed function reference in 'subwindow' test
Modified:
branches/branch-3.0/src/fltk3/Group.cxx
branches/branch-3.0/test/subwindow.cxx
Modified: branches/branch-3.0/src/fltk3/Group.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Group.cxx 2012-05-07 23:34:19 UTC (rev
9457)
+++ branches/branch-3.0/src/fltk3/Group.cxx 2012-05-08 07:08:16 UTC (rev
9458)
@@ -99,35 +99,6 @@
// For back-compatibility, we must adjust all events sent to child
// windows so they are relative to that window.
-static int send(fltk3::Widget* o, int event) {
- if (o->type()<fltk3::WINDOW) {
- return o->handle(event);
- }
- switch ( event )
- {
- case fltk3::DND_ENTER: /* FALLTHROUGH */
- case fltk3::DND_DRAG:
- // figure out correct type of event:
- event = (o->contains(fltk3::belowmouse())) ? fltk3::DND_DRAG :
fltk3::DND_ENTER;
- }
- int save_x = fltk3::e_x; fltk3::e_x -= o->x();
- int save_y = fltk3::e_y; fltk3::e_y -= o->y();
- int ret = o->handle(event);
- fltk3::e_y = save_y;
- fltk3::e_x = save_x;
- switch ( event )
- {
- case fltk3::ENTER: /* FALLTHROUGH */
- case fltk3::DND_ENTER:
- // Successful completion of fltk3::ENTER means the widget is now the
- // belowmouse widget, but only call fltk3::belowmouse if the child
- // widget did not do so:
- if (!o->contains(fltk3::belowmouse())) fltk3::belowmouse(o);
- break;
- }
- return ret;
-}
-
// translate the current keystroke into up/down/left/right for navigation:
#define ctrl(x) (x^0x40)
static int navkey() {
@@ -737,7 +708,6 @@
}
} else { // only redraw the children that need it:
for (int i=children_; i--;) {
- Widget *w = *a;
update_child(**a++);
}
}
Modified: branches/branch-3.0/test/subwindow.cxx
===================================================================
--- branches/branch-3.0/test/subwindow.cxx 2012-05-07 23:34:19 UTC (rev
9457)
+++ branches/branch-3.0/test/subwindow.cxx 2012-05-08 07:08:16 UTC (rev
9458)
@@ -199,14 +199,14 @@
int main(int argc, char **argv) {
testwindow *window =
- new testwindow(fltk3::UP_BOX,820,400,"outer");
+ new testwindow(fltk3::UP_BOX,400,400,"outer");
new fltk3::ToggleButton(310,310,80,80,"&outer");
new EnterExit(10,310,80,80,"enterexit");
new fltk3::Input(160,310,140,25,"input1:");
new fltk3::Input(160,340,140,25,"input2:");
(new fltk3::MenuButton(5,150,80,25,"menu&1"))->add(bigmess);
- (new fltk3::Box(fltk3::NO_BOX,150,0,520,100,
+ (new fltk3::Box(fltk3::NO_BOX,0,0,400,100,
"A child fltk3::Window with children of its own may "
"be useful for imbedding controls into a GL or display "
"that needs a different visual."
@@ -229,31 +229,6 @@
subwindow->end();
subwindow->use_cursor(fltk3::CURSOR_HAND);
- testgroup *subgroup2 =
- new testgroup(fltk3::DOWN_BOX,310,100,200,200,"fltk3::Group,
GROUP_RELATIVE");
- subgroup2->set_group_relative();
- new fltk3::ToggleButton(110,110,80,80,"&inner");
- new EnterExit(10,110,80,80,"enterexit");
- (new fltk3::MenuButton(50,20,80,25,"menu&2"))->add(bigmess);
- new fltk3::Input(55,50,140,25,"input1:");
- new fltk3::Input(55,80,140,25,"input2:");
- //subgroup2->resizable(subgroup2);
- window->resizable(subgroup2);
- subgroup2->end();
- subgroup2->use_cursor(fltk3::CURSOR_HAND);
-
- testgroup *subgroup3 =
- new testgroup(fltk3::DOWN_BOX,520,100,200,200,"fltk3::Group,
Window-relative");
- subgroup3->set_window_relative();
- new fltk3::ToggleButton(630,210,80,80,"&inner");
- new EnterExit(530,210,80,80,"enterexit");
- (new fltk3::MenuButton(570,120,80,25,"menu&2"))->add(bigmess);
- new fltk3::Input(575,150,140,25,"input1:");
- new fltk3::Input(575,180,140,25,"input2:");
- subgroup3->resizable(subgroup3);
- subgroup3->end();
- subgroup3->use_cursor(fltk3::CURSOR_HAND);
-
window->show(argc, argv);
return fltk3::run();
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
