Mercurial > octave

diff libgui/graphics/BaseControl.cc @ 21782:2aef506f3fec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use namespace for lo-mappers.h functions * lo-mappers.h, lo-mappers.cc (acos, arg, asin, atan, ceil, conj, copysign, exp2, finite, fix, floor, imag, is_NA, is_NaN_or_NA, isinf, isinteger, isnan, log2, max, min, mod, negative_sign, nint, nint_big, positive_sign, rc_acos, rc_acosh, rc_asin, rc_atanh, rc_log, rc_log10, rc_log2, rc_sqrt, real, rem, round, roundb, signbit, signum, trunc, x_nint): Define in octave::math namespace. Deprecate old names. Change all uses. * oct-inttypes.h: Put round and isnan functions in octave::math namespace and rename from xround and xisnan. Change all uses.
author John W. Eaton <jwe@octave.org>
date Wed, 25 May 2016 16:51:16 -0400
parents aba2e6293dd8
children bac0d6f07a3e
line wrap: on
line diff
--- a/libgui/graphics/BaseControl.cc	Fri May 27 10:20:48 2016 -0400
+++ b/libgui/graphics/BaseControl.cc	Wed May 25 16:51:16 2016 -0400
@@ -84,8 +84,8 @@
   uicontrol::properties& up = properties<uicontrol> ();
 
   Matrix bb = up.get_boundingbox (false);
-  w->setGeometry (xround (bb(0)), xround (bb(1)),
-                  xround (bb(2)), xround (bb(3)));
+  w->setGeometry (octave::math::round (bb(0)), octave::math::round (bb(1)),
+                  octave::math::round (bb(2)), octave::math::round (bb(3)));
   w->setFont (Utils::computeFont<uicontrol> (up, bb(3)));
   updatePalette (up, w);
   w->setEnabled (up.enable_is ("on"));
@@ -113,8 +113,8 @@
     case uicontrol::properties::ID_POSITION:
         {
           Matrix bb = up.get_boundingbox (false);
-          w->setGeometry (xround (bb(0)), xround (bb(1)),
-                          xround (bb(2)), xround (bb(3)));
+          w->setGeometry (octave::math::round (bb(0)), octave::math::round (bb(1)),
+                          octave::math::round (bb(2)), octave::math::round (bb(3)));
         }
       break;