Mercurial > octave-nkf
changeset 8263:22c078fd926b
make fltk backend figures work again
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 22 Oct 2008 13:28:43 -0400 |
| parents | c44db9bad841 |
| children | bca580bbda02 |
| files | src/ChangeLog src/DLD-FUNCTIONS/fltk_backend.cc src/gl-render.cc src/graphics.h.in |
| diffstat | 4 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Oct 22 13:01:39 2008 -0400 +++ b/src/ChangeLog Wed Oct 22 13:28:43 2008 -0400 @@ -1,3 +1,12 @@ +2008-10-22 John W. Eaton <jwe@octave.org> + + * 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 <dbateman@free.fr> * graphics.h.in (line::properties, surface::properties): Add data
--- a/src/DLD-FUNCTIONS/fltk_backend.cc Wed Oct 22 13:01:39 2008 -0400 +++ b/src/DLD-FUNCTIONS/fltk_backend.cc Wed Oct 22 13:28:43 2008 -0400 @@ -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 ();
--- a/src/gl-render.cc Wed Oct 22 13:01:39 2008 -0400 +++ b/src/gl-render.cc Wed Oct 22 13:28:43 2008 -0400 @@ -575,7 +575,7 @@ // Draw children - draw (props.get_children ()); + draw (props.get_all_children ()); } void
--- a/src/graphics.h.in Wed Oct 22 13:01:39 2008 -0400 +++ b/src/graphics.h.in Wed Oct 22 13:28:43 2008 -0400 @@ -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); }