# HG changeset patch
# User Rik <rik@octave.org>
# Date 1544731059 28800
# Node ID 1a12d4369beb7244e4bfa641493ebb8c12cf6edf
# Parent  07e60035b09bcbe1d14e9ed436125966394ed66a
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.

diff -r 07e60035b09b -r 1a12d4369beb libgui/graphics/PushButtonControl.cc
--- 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;
       }
   }
diff -r 07e60035b09b -r 1a12d4369beb libgui/graphics/ToggleButtonControl.cc
--- 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;
       }
   }