Mercurial > hg > octave-nkf

changeset 19947:55a4173f1624

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use "filename" property of figure to store filename for Save dialog under FLTK. * __add_default_menu__.m: Store filename on figure "filename" property rather than "userdata" property of uimenu object.
author Rik <rik@octave.org>
date Tue, 17 Feb 2015 16:24:30 -0800
parents b8e4104a8f55
children 67f2c76f9f4d
files scripts/plot/util/private/__add_default_menu__.m
diffstat 1 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/util/private/__add_default_menu__.m
+++ b/scripts/plot/util/private/__add_default_menu__.m
@@ -59,16 +59,17 @@
 endfunction
 
 function save_cb (h, e)
-  lbl = get (gcbo, "label");
+  [hcbo, hfig] = gcbo ();
+  lbl = get (hcbo, "label");
   if (strcmp (lbl, "&Save"))
-    fname = get (gcbo, "userdata");
+    fname = get (hfig, "filename");
     if (isempty (fname))
-      __save_as__ (gcbo);
+      __save_as__ (hcbo);
     else
-      saveas (gcbo, fname);
+      saveas (hcbo, fname);
     endif
   elseif (strcmp (lbl, "Save &As"))
-    __save_as__ (gcbo);
+    __save_as__ (hcbo);
   endif
 endfunction
 
@@ -79,10 +80,7 @@
                                    [pwd, filesep, "untitled.pdf"]);
   if (filename != 0)
     fname = [filedir filesep() filename];
-    obj = findall (gcbf, "label", "&Save");
-    if (! isempty (obj))
-      set (obj(1), "userdata", fname);
-    endif
+    set (gcbf, "filename", fname)
     saveas (caller, fname);
   endif
 endfunction