# HG changeset patch # User John W. Eaton # Date 1224696523 14400 # Node ID 22c078fd926bf99a451391e1e7b660dc75d287b0 # Parent c44db9bad841ef12d544e226784396c9a665d5e2 make fltk backend figures work again diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2008-10-22 John W. Eaton + + * gl-render.cc (opengl_renderer::draw): Get all children. + + * DLD-FUNCTIONS/fltk_backend.cc (__fltk_redraw__): + Check for "root" object, not "root_figure". + + * graphics.h.in (base_properties::get_all_children): New function. + 2008-10-22 David Bateman * graphics.h.in (line::properties, surface::properties): Add data diff --git a/src/DLD-FUNCTIONS/fltk_backend.cc b/src/DLD-FUNCTIONS/fltk_backend.cc --- a/src/DLD-FUNCTIONS/fltk_backend.cc +++ b/src/DLD-FUNCTIONS/fltk_backend.cc @@ -764,7 +764,7 @@ { // we scan all figures and add those which use FLTK as a backend graphics_object obj = gh_manager::get_object (0); - if (obj && obj.isa ("root_figure")) + if (obj && obj.isa ("root")) { base_properties& props = obj.get_properties (); Matrix children = props.get_children (); diff --git a/src/gl-render.cc b/src/gl-render.cc --- a/src/gl-render.cc +++ b/src/gl-render.cc @@ -575,7 +575,7 @@ // Draw children - draw (props.get_children ()); + draw (props.get_all_children ()); } void diff --git a/src/graphics.h.in b/src/graphics.h.in --- a/src/graphics.h.in +++ b/src/graphics.h.in @@ -1636,6 +1636,8 @@ void set_parent (const octave_value& val); + Matrix get_all_children (void) const { return children; } + void set_children (const octave_value& val); void set_modified (const octave_value& val) { set___modified__ (val); }