Mercurial > octave
comparison libinterp/corefcn/graphics.in.h @ 22190:e68128601f5e
skip invalid objects in Qt graphics event handlers (bug #46501)
* Container.cc (Container::resizeEvent): Avoid accessing properties
from invalid graphics object.
* Panel.cc (Panel::eventFilter): Likewise.
* graphics.in.h (base_graphics_object:get_properties): Issue warning
instead of error.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 28 Jul 2016 16:07:11 -0400 |
parents | 9121d6584f6a |
children | 446b542fd082 |
comparison
equal
deleted
inserted
replaced
22189:829e0aafebdc | 22190:e68128601f5e |
---|---|
2794 } | 2794 } |
2795 | 2795 |
2796 virtual base_properties& get_properties (void) | 2796 virtual base_properties& get_properties (void) |
2797 { | 2797 { |
2798 static base_properties properties; | 2798 static base_properties properties; |
2799 error ("base_graphics_object::get_properties: invalid graphics object"); | 2799 warning ("base_graphics_object::get_properties: invalid graphics object"); |
2800 return properties; | |
2800 } | 2801 } |
2801 | 2802 |
2802 virtual const base_properties& get_properties (void) const | 2803 virtual const base_properties& get_properties (void) const |
2803 { | 2804 { |
2804 static base_properties properties; | 2805 static base_properties properties; |
2805 error ("base_graphics_object::get_properties: invalid graphics object"); | 2806 warning ("base_graphics_object::get_properties: invalid graphics object"); |
2807 return properties; | |
2806 } | 2808 } |
2807 | 2809 |
2808 virtual void update_axis_limits (const std::string& axis_type); | 2810 virtual void update_axis_limits (const std::string& axis_type); |
2809 | 2811 |
2810 virtual void update_axis_limits (const std::string& axis_type, | 2812 virtual void update_axis_limits (const std::string& axis_type, |