Mercurial > jwe > octave
changeset 23209:5d9d756724cc
Disable deprecation warnings when resetting graphics objects (bug #50327)
* xreset_default_properties: disable deprecation warnings
* axes::reset_default_properties: dito
author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
---|---|
date | Sun, 19 Feb 2017 21:19:34 +0100 |
parents | 8fd8ed1e3aa2 |
children | 3a298e07002c |
files | libinterp/corefcn/graphics.cc |
diffstat | 1 files changed, 20 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc Sun Feb 19 21:10:03 2017 -0800 +++ b/libinterp/corefcn/graphics.cc Sun Feb 19 21:19:34 2017 +0100 @@ -2954,6 +2954,10 @@ for (const auto& p : pval) factory_pval[p.first] = p.second; + // Save warning state of "Octave:deprecated-property" + int old_dep_prop = warning_enabled ("Octave:deprecated-property"); + disable_warning ("Octave:deprecated-property"); + // Reset defaults for (const auto& p : factory_pval) { @@ -2975,6 +2979,12 @@ // set *mode properties for (const auto& p : pval) go.set (p.first, p.second); + + // Re-enable warning state of "Octave:deprecated-property" + if (old_dep_prop == 1) + set_warning_state ("Octave:deprecated-property", "on"); + else if (old_dep_prop == 2) + set_warning_state ("Octave:deprecated-property", "error"); } // --------------------------------------------------------------------- @@ -3355,19 +3365,8 @@ gh_manager::get_object (0).get_factory_defaults_list () .find (type ())->second; - // save warning state of "Octave:deprecated-property" - int old_dep_prop = warning_enabled ("Octave:deprecated-property"); - disable_warning ("Octave:deprecated-property"); - remove_all_listeners (); xreset_default_properties (get_handle (), factory_pval); - - // re-enable warning state of "Octave:deprecated-property" - if (old_dep_prop == 1) - set_warning_state ("Octave:deprecated-property", "on"); - else if (old_dep_prop == 2) - set_warning_state ("Octave:deprecated-property", "error"); - } } @@ -8204,9 +8203,19 @@ // empty list of local defaults default_properties = property_list (); + // Save warning state of "Octave:deprecated-property" + int old_dep_prop = warning_enabled ("Octave:deprecated-property"); + disable_warning ("Octave:deprecated-property"); + // reset factory defaults remove_all_listeners (); set_defaults ("reset"); + + // Re-enable warning state of "Octave:deprecated-property" + if (old_dep_prop == 1) + set_warning_state ("Octave:deprecated-property", "on"); + else if (old_dep_prop == 2) + set_warning_state ("Octave:deprecated-property", "error"); } void