changeset 22665:4ea5b0c3b10f

Make base graphics property __modified__ hidden (bug #49205). * plot.txi: Update list of properties visible on figure object. * graphics.in.h: Add 'h' to parameter list of __modified__ to make it hidden. * hdl2struct.m (getprops): Remove __modified__ and __graphics_toolkit__ from list of properties that are removed before copying.
author Rik <rik@octave.org>
date Mon, 24 Oct 2016 13:46:44 -0700
parents f1bb2f0bcfec
children 68d5c4759783
files doc/interpreter/plot.txi libinterp/corefcn/graphics.in.h scripts/plot/util/hdl2struct.m
diffstat 3 files changed, 33 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/plot.txi	Mon Oct 24 13:16:18 2016 -0700
+++ b/doc/interpreter/plot.txi	Mon Oct 24 13:46:44 2016 -0700
@@ -1137,31 +1137,34 @@
 get (h, "");
 error: get: ambiguous figure property name ; possible matches:
 
-__enhanced__           hittest                resize
-__graphics_toolkit__   integerhandle          resizefcn
-__guidata__            interruptible          selected
-__modified__           inverthardcopy         selectionhighlight
-__myhandle__           keypressfcn            selectiontype
-__plot_stream__        keyreleasefcn          tag
-alphamap               menubar                toolbar
-beingdeleted           mincolormap            type
-busyaction             name                   uicontextmenu
-buttondownfcn          nextplot               units
-children               numbertitle            userdata
-clipping               outerposition          visible
-closerequestfcn        paperorientation       windowbuttondownfcn
-color                  paperposition          windowbuttonmotionfcn
-colormap               paperpositionmode      windowbuttonupfcn
-createfcn              papersize              windowkeypressfcn
-currentaxes            papertype              windowkeyreleasefcn
-currentcharacter       paperunits             windowscrollwheelfcn
-currentobject          parent                 windowstyle
-currentpoint           pointer                wvisual
-deletefcn              pointershapecdata      wvisualmode
-dockcontrols           pointershapehotspot    xdisplay
-doublebuffer           position               xvisual
-filename               renderer               xvisualmode
-handlevisibility       renderermode
+__gl_extensions__      dockcontrols           renderer
+__gl_renderer__        doublebuffer           renderermode
+__gl_vendor__          filename               resize
+__gl_version__         graphicssmoothing      resizefcn
+__graphics_toolkit__   handlevisibility       selected
+__guidata__            hittest                selectionhighlight
+__modified__           integerhandle          selectiontype
+__mouse_mode__         interruptible          sizechangedfcn
+__myhandle__           inverthardcopy         tag
+__pan_mode__           keypressfcn            toolbar
+__plot_stream__        keyreleasefcn          type
+__rotate_mode__        menubar                uicontextmenu
+__zoom_mode__          mincolormap            units
+alphamap               name                   userdata
+beingdeleted           nextplot               visible
+busyaction             numbertitle            windowbuttondownfcn
+buttondownfcn          outerposition          windowbuttonmotionfcn
+children               paperorientation       windowbuttonupfcn
+clipping               paperposition          windowkeypressfcn
+closerequestfcn        paperpositionmode      windowkeyreleasefcn
+color                  papersize              windowscrollwheelfcn
+colormap               papertype              windowstyle
+createfcn              paperunits             wvisual
+currentaxes            parent                 wvisualmode
+currentcharacter       pointer                xdisplay
+currentobject          pointershapecdata      xvisual
+currentpoint           pointershapehotspot    xvisualmode
+deletefcn              position
 @end smallexample
 
 The root figure has index 0.  Its properties may be displayed by:
--- a/libinterp/corefcn/graphics.in.h	Mon Oct 24 13:16:18 2016 -0700
+++ b/libinterp/corefcn/graphics.in.h	Mon Oct 24 13:46:44 2016 -0700
@@ -2615,7 +2615,7 @@
     any_property userdata , Matrix ()
     bool_property visible , "on"
     // additional (Octave-specific) properties
-    bool_property __modified__ s , "on"
+    bool_property __modified__ hs , "on"
     graphics_handle __myhandle__ fhrs , mh
   END_PROPERTIES
 
--- a/scripts/plot/util/hdl2struct.m	Mon Oct 24 13:16:18 2016 -0700
+++ b/scripts/plot/util/hdl2struct.m	Mon Oct 24 13:46:44 2016 -0700
@@ -141,11 +141,10 @@
   forbid = {"beingdeleted", "busyaction", "buttondownfcn", ...
             "children", "clipping", "createfcn", ...
             "deletefcn", "handlevisibility", "hittest", ...
-            "interruptible", "parent", "selected" ,...
-            "selectionhighlight", "type", "__modified__", ...
-            "uicontextmenu", "__graphics_toolkit__", "currentaxes", ...
-            "currentcharacter", "currentobject","tightinset", ...
-            "currentpoint", "extent"};
+            "interruptible", "parent", "selected" , ...
+            "selectionhighlight", "type", "uicontextmenu", ...
+            "currentaxes", "currentcharacter", "currentobject", ...
+            "tightinset", "currentpoint", "extent"};
 
   nflds = length (fields);
   ii = 0;