Mercurial > octave-nkf

comparison src/graphics.cc @ 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 d99aa455296e
children 6dfebfa334cb
comparison
equal deleted inserted replaced
13735:2cd903770748 13736:deb69dab4514
2540 2540
2541 bool 2541 bool
2542 base_properties::is_handle_visible (void) const 2542 base_properties::is_handle_visible (void) const
2543 { 2543 {
2544 return (handlevisibility.is ("on") 2544 return (handlevisibility.is ("on")
2545 || executing_callback && ! handlevisibility.is ("off")); 2545 || (executing_callback && ! handlevisibility.is ("off")));
2546 } 2546 }
2547 2547
2548 graphics_toolkit 2548 graphics_toolkit
2549 base_properties::get_toolkit (void) const 2549 base_properties::get_toolkit (void) const
2550 { 2550 {
6944 octave_value 6944 octave_value
6945 uicontrol::properties::get_extent (void) const 6945 uicontrol::properties::get_extent (void) const
6946 { 6946 {
6947 Matrix m = extent.get ().matrix_value (); 6947 Matrix m = extent.get ().matrix_value ();
6948 6948
6949 graphics_handle parent = get_parent (); 6949 graphics_object parent_obj =
6950 graphics_object parent_obj = gh_manager::get_object (parent); 6950 gh_manager::get_object (get_parent ());
6951 Matrix parent_bbox = parent_obj.get_properties ().get_boundingbox (true), 6951 Matrix parent_bbox = parent_obj.get_properties ().get_boundingbox (true),
6952 parent_size = parent_bbox.extract_n (0, 2, 1, 2); 6952 parent_size = parent_bbox.extract_n (0, 2, 1, 2);
6953 6953
6954 return convert_position (m, "pixels", get_units (), parent_size); 6954 return convert_position (m, "pixels", get_units (), parent_size);
6955 } 6955 }
6991 void 6991 void
6992 uicontrol::properties::update_units (void) 6992 uicontrol::properties::update_units (void)
6993 { 6993 {
6994 Matrix pos = get_position ().matrix_value (); 6994 Matrix pos = get_position ().matrix_value ();
6995 6995
6996 graphics_handle parent = get_parent (); 6996 graphics_object parent_obj = gh_manager::get_object (get_parent ());
6997 graphics_object parent_obj = gh_manager::get_object (parent);
6998 Matrix parent_bbox = parent_obj.get_properties ().get_boundingbox (true), 6997 Matrix parent_bbox = parent_obj.get_properties ().get_boundingbox (true),
6999 parent_size = parent_bbox.extract_n (0, 2, 1, 2); 6998 parent_size = parent_bbox.extract_n (0, 2, 1, 2);
7000 6999
7001 pos = convert_position (pos, cached_units, get_units (), parent_size); 7000 pos = convert_position (pos, cached_units, get_units (), parent_size);
7002 set_position (pos); 7001 set_position (pos);
7163 void 7162 void
7164 uipanel::properties::update_units (const caseless_str& old_units) 7163 uipanel::properties::update_units (const caseless_str& old_units)
7165 { 7164 {
7166 Matrix pos = get_position ().matrix_value (); 7165 Matrix pos = get_position ().matrix_value ();
7167 7166
7168 graphics_handle parent = get_parent (); 7167 graphics_object parent_obj = gh_manager::get_object (get_parent ());
7169 graphics_object parent_obj = gh_manager::get_object (parent);
7170 Matrix parent_bbox = parent_obj.get_properties ().get_boundingbox (true), 7168 Matrix parent_bbox = parent_obj.get_properties ().get_boundingbox (true),
7171 parent_size = parent_bbox.extract_n (0, 2, 1, 2); 7169 parent_size = parent_bbox.extract_n (0, 2, 1, 2);
7172 7170
7173 pos = convert_position (pos, old_units, get_units (), parent_size); 7171 pos = convert_position (pos, old_units, get_units (), parent_size);
7174 set_position (pos); 7172 set_position (pos);
7726 } 7724 }
7727 7725
7728 void 7726 void
7729 gh_manager::do_enable_event_processing (bool enable) 7727 gh_manager::do_enable_event_processing (bool enable)
7730 { 7728 {
7731 gh_manager::auto_lock lock; 7729 gh_manager::auto_lock guard;
7732 7730
7733 if (enable) 7731 if (enable)
7734 { 7732 {
7735 event_processing++; 7733 event_processing++;
7736 7734