Mercurial > hg > octave-lyh
diff gui/src/octave-adapter/octave-main-thread.cc @ 15137:16a6b0a6855d gui
GUI: support for octave arguments and integrate with run-octave.
* src/octave.h (octave_initialize_interpreter, octave_execute_interpreter):
New functions.
(octave_cmdline_argc, octave_cmdline_argv, octave_embedded): New variables.
* src/octave.cc (octave_cmdline_argc, octave_cmdline_argv, octave_embedded):
New variables.
(octave_initialize_interpreter, octave_execute_interpreter): New functions.
(octave_main): Rewrite using them.
* run-octave.in (octave_executable): New variable.
(-gui): New option flag.
* gui/src/octave-adapter/octave-main-thread.cc (octave_main_thread::run):
Use octave_execute_interpreter.
* gui/src/octave-gui.cc (dissociate_terminal): New function.
(main): Use it. Also use octave_initialize_interpreter.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 05 Aug 2012 16:15:58 -0400 |
parents | 1ffaad442161 |
children | 9e62d5a3a45e |
line wrap: on
line diff
--- a/gui/src/octave-adapter/octave-main-thread.cc +++ b/gui/src/octave-adapter/octave-main-thread.cc @@ -27,8 +27,6 @@ octave_main_thread::run () { setlocale (LC_ALL, "en_US.UTF-8"); - int argc = 1; - const char *argv[] = { "octave" }; emit ready (); - octave_main (argc, const_cast<char**>(argv), 0); + octave_execute_interpreter (); }