Mercurial > hg > octave-nkf
diff src/graphics.cc @ 13736:deb69dab4514
Avoid some compilation warnings.
* graphics.cc (base_properties::is_handle_visible): Add parenthesis.
(uicontrol::properties::get_extent): Don't use "parent" variable.
(uicontrol::properties::update_units): Likewise.
(uipanel::properties::update_units): Likewise.
(gh_manager::do_event_processing): Rename "lock" variable into "guard".
* ov.h (DEF_DUMMY_VALUE_EXTRACTOR): Remove unused argument name.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Thu, 20 Oct 2011 15:19:38 +0100 |
| parents | d99aa455296e |
| children | 6dfebfa334cb |
line wrap: on
line diff
--- a/src/graphics.cc +++ b/src/graphics.cc @@ -2542,7 +2542,7 @@ base_properties::is_handle_visible (void) const { return (handlevisibility.is ("on") - || executing_callback && ! handlevisibility.is ("off")); + || (executing_callback && ! handlevisibility.is ("off"))); } graphics_toolkit @@ -6946,8 +6946,8 @@ { Matrix m = extent.get ().matrix_value (); - graphics_handle parent = get_parent (); - graphics_object parent_obj = gh_manager::get_object (parent); + graphics_object parent_obj = + gh_manager::get_object (get_parent ()); Matrix parent_bbox = parent_obj.get_properties ().get_boundingbox (true), parent_size = parent_bbox.extract_n (0, 2, 1, 2); @@ -6993,8 +6993,7 @@ { Matrix pos = get_position ().matrix_value (); - graphics_handle parent = get_parent (); - graphics_object parent_obj = gh_manager::get_object (parent); + graphics_object parent_obj = gh_manager::get_object (get_parent ()); Matrix parent_bbox = parent_obj.get_properties ().get_boundingbox (true), parent_size = parent_bbox.extract_n (0, 2, 1, 2); @@ -7165,8 +7164,7 @@ { Matrix pos = get_position ().matrix_value (); - graphics_handle parent = get_parent (); - graphics_object parent_obj = gh_manager::get_object (parent); + graphics_object parent_obj = gh_manager::get_object (get_parent ()); Matrix parent_bbox = parent_obj.get_properties ().get_boundingbox (true), parent_size = parent_bbox.extract_n (0, 2, 1, 2); @@ -7728,7 +7726,7 @@ void gh_manager::do_enable_event_processing (bool enable) { - gh_manager::auto_lock lock; + gh_manager::auto_lock guard; if (enable) {