Mercurial > octave

changeset 26225:1a12d4369beb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix "Value" property for uicontrol togglebuttons (bug #55211). Also fix "string" property for uicontrol pushbuttons. * ToggleButtonControl.cc (update): If property is not handled by ToggleButton update() function then forward event to ButtonControl::update. * PushButtonControl.cc (update): Remove handling of "string" property. If property is not handled by PushButton update() function then forward event to ButtonControl::update.
author Rik <rik@octave.org>
date Thu, 13 Dec 2018 11:57:39 -0800
parents 07e60035b09b
children 3a90eff58fb5
files libgui/graphics/PushButtonControl.cc libgui/graphics/ToggleButtonControl.cc
diffstat 2 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/PushButtonControl.cc	Thu Dec 13 14:04:39 2018 -0500
+++ b/libgui/graphics/PushButtonControl.cc	Thu Dec 13 11:57:39 2018 -0800
@@ -74,10 +74,6 @@
 
     switch (pId)
       {
-      case uicontrol::properties::ID_STRING:
-        btn->setText (Utils::fromStdString (up.get_string_string ()));
-        break;
-
       case uicontrol::properties::ID_CDATA:
         {
           octave_value cdat = up.get_cdata ();
@@ -89,7 +85,7 @@
         break;
 
       default:
-        BaseControl::update (pId);
+        ButtonControl::update (pId);
         break;
       }
   }
--- a/libgui/graphics/ToggleButtonControl.cc	Thu Dec 13 14:04:39 2018 -0500
+++ b/libgui/graphics/ToggleButtonControl.cc	Thu Dec 13 11:57:39 2018 -0800
@@ -91,7 +91,7 @@
         break;
 
       default:
-        BaseControl::update (pId);
+        ButtonControl::update (pId);
         break;
       }
   }