Mercurial > octave-nkf

changeset 13736:deb69dab4514

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2cd903770748
children 30414ff19d5e
files src/graphics.cc src/ov.h
diffstat 2 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/graphics.cc	Thu Oct 20 14:08:25 2011 +0100
+++ b/src/graphics.cc	Thu Oct 20 15:19:38 2011 +0100
@@ -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)
     {
--- a/src/ov.h	Thu Oct 20 14:08:25 2011 +0100
+++ b/src/ov.h	Thu Oct 20 15:19:38 2011 +0100
@@ -1373,7 +1373,7 @@
 
 #define DEF_DUMMY_VALUE_EXTRACTOR(VALUE,DEFVAL) \
 template<> \
-inline VALUE octave_value_extract<VALUE> (const octave_value& v) \
+inline VALUE octave_value_extract<VALUE> (const octave_value&) \
   { assert (false); return DEFVAL; }
 
 DEF_DUMMY_VALUE_EXTRACTOR (char, 0)