octave-nkf: src/graphics.cc comparison

Fix execution of callback strings and allow execution of callback by name.

author	Michael Goffioul <michael.goffioul@gmail.com>
date	Fri, 08 Feb 2008 16:46:34 +0100
parents	edbaa13397ee
children	3584f37eac69

comparison

equal deleted inserted replaced

-:feaaf725c54f
+:adb520646d7e
 {
 octave_value_list args;
 octave_function *fcn = 0;
 args(0) = h.as_octave_value ();
-args(1) = data;
+if (data.is_defined ())
+args(1) = data;
+else
+args(1) = Matrix ();
 unwind_protect::begin_frame ("execute_callback");
 unwind_protect::add (xreset_gcbo);
 xset_gcbo (h);
 if (cb.is_function_handle ())
 fcn = cb.function_value ();
 else if (cb.is_string ())
 {
+int status;
 std::string s = cb.string_value ();
-octave_value f = symbol_table::find_function (s);
-int status;
+eval_string (s, false, status);
-if (f.is_defined ())
-fcn = f.function_value ();
-else
-	eval_string (s, false, status);
 }
 else if (cb.is_cell () && cb.length () > 0
 && (cb.rows () == 1 || cb.columns () == 1)
 && cb.cell_value ()(0).is_function_handle ())
 {
 void
 callback_property::execute (const octave_value& data) const
 {
 if (callback.is_defined () && ! callback.is_empty ())
 execute_callback (callback, get_parent (), data);
+}
+void
+callback_property::execute (const octave_value& cb, const graphics_handle& h,
+			    const octave_value& data)
+{
+if (cb.is_defined () && ! cb.is_empty ())
+execute_callback (cb, h, data);
 }
 // ---------------------------------------------------------------------
 void

Mercurial > octave-nkf