Mercurial > hg > octave-nkf
comparison src/toplev.h @ 14014:907d03def9d5
explicitly close figures in clean_up_and_exit instead of using an atexit function
* graphics.cc (Fdrawnow): Don't register __go_close_all__ as an atexit
function.
* __go_close_all__.m: Delete.
* plot/module.mk (plot_FCN_FILES): Remove __go_close_all__.m from the
list.
* graphics.cc (gh_manager::create_instance): Do register cleanup
function.
* graphics.cc (delete_graphics_objects, delete_graphics_object,
close_figure, force_close_figure): New functions.
(F__go_delete__): Call delete_graphics_objects to do the work.
* graphics.h, graphics.cc (gh_manager::close_all_figures,
gh_manager::do_close_all_figures): New functions.
* graphics.h.in, graphics.cc (close_all_figures): New function.
* toplev.cc (clean_up_and_exit): Call close_all_figures.
* graphics.h.in (uitoggletool::~uitoggletool, uipushtool::~uipushtool,
uitoolbar::~uitoolbar, uipanel::~uipanel, uicontrol::~uicontrol,
uicontextmenu::~uicontextmenu, uimenu::~uimenu, hggroup::~hggroup,
surface::~surface, image::~image, text::~text, line::~line,
axes::~axes, figure::~figure, root_figure::~root_figure):
Don't delete children.
* toplev.cc (SAFE_CALL, IGNORE_INTERRUPT): Rename to OCTAVE_SAFE_CALL
and OCTAVE_IGNORE_INTERRUPT and move to toplev.h. Temporarily set
Vdebug_on_error and Vdebug_on_warning. Reset error_state to zero.
Change all callers.
* graphics.h.in (base_graphics_toolkit::close): New virtual function.
(graphics_toolkit::close, graphics_toolkit::close_all_toolkits):
New functions.
* graphics.cc (gnuplot_toolkit::close): New function.
):
* __init_fltk__.cc (F__init_fltk__): Don't register __remove_fltk__ as
an atexit function.
(F__remove_fltk__): Move to fltk_toolkit::close.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 08 Dec 2011 06:28:18 -0500 |
parents | 7dd7cccf0757 |
children | 72c96de7a403 |
comparison
equal
deleted
inserted
replaced
14013:1734ebe27134 | 14014:907d03def9d5 |
---|---|
416 void do_clear (void) { cs.clear (); } | 416 void do_clear (void) { cs.clear (); } |
417 | 417 |
418 void do_backtrace_error_message (void) const; | 418 void do_backtrace_error_message (void) const; |
419 }; | 419 }; |
420 | 420 |
421 // Call a function with exceptions handled to avoid problems with | |
422 // errors while shutting down. | |
423 | |
424 #define OCTAVE_IGNORE_EXCEPTION(E) \ | |
425 catch (E) \ | |
426 { \ | |
427 std::cerr << "error: ignoring " #E " while preparing to exit" << std::endl; \ | |
428 recover_from_exception (); \ | |
429 } | |
430 | |
431 #define OCTAVE_SAFE_CALL(F, ARGS) \ | |
432 do \ | |
433 { \ | |
434 try \ | |
435 { \ | |
436 unwind_protect frame; \ | |
437 \ | |
438 frame.protect_var (Vdebug_on_error); \ | |
439 frame.protect_var (Vdebug_on_warning); \ | |
440 \ | |
441 Vdebug_on_error = false; \ | |
442 Vdebug_on_warning = false; \ | |
443 \ | |
444 F ARGS; \ | |
445 } \ | |
446 OCTAVE_IGNORE_EXCEPTION (octave_interrupt_exception) \ | |
447 OCTAVE_IGNORE_EXCEPTION (octave_execution_exception) \ | |
448 OCTAVE_IGNORE_EXCEPTION (std::bad_alloc) \ | |
449 \ | |
450 if (error_state) \ | |
451 error_state = 0; \ | |
452 } \ | |
453 while (0) | |
454 | |
421 #endif | 455 #endif |