Mercurial > octave

changeset 32732:b38f124af0d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default
author John W. Eaton <jwe@octave.org>
date Thu, 11 Jan 2024 14:23:56 -0500
parents 343b7e8d7f09 (current diff) 4c90bb1003ba (diff)
children 6bfe60a31f73
files
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/EditControl.cc	Thu Jan 11 13:54:27 2024 -0500
+++ b/libgui/graphics/EditControl.cc	Thu Jan 11 14:23:56 2024 -0500
@@ -47,7 +47,7 @@
 
       if (container)
         {
-          uicontrol::properties& up = Utils::properties<uicontrol> (go);
+          const uicontrol::properties& up = Utils::properties<uicontrol> (go);
 
           if ((up.get_max () - up.get_min ()) > 1)
             return new EditControl (interp, go,
--- a/libgui/graphics/QtHandlesUtils.h	Thu Jan 11 13:54:27 2024 -0500
+++ b/libgui/graphics/QtHandlesUtils.h	Thu Jan 11 14:23:56 2024 -0500
@@ -69,9 +69,14 @@
 
   template <typename T>
   inline typename T::properties&
-  properties (graphics_object obj)
+  properties (graphics_object& obj)
   { return dynamic_cast<typename T::properties&> (obj.get_properties ()); }
 
+  template <typename T>
+  inline const typename T::properties&
+  properties (const graphics_object& obj)
+  { return dynamic_cast<const typename T::properties&> (obj.get_properties ()); }
+
   QImage makeImageFromCData (const octave_value& v, int width = -1,
                              int height = -1);