From 5b859b6add5d2d34505ec1d900de644ceedbc8dc Mon Sep 17 00:00:00 2001 From: tchernobog Date: Mon, 5 Mar 2007 14:55:23 +0000 Subject: [PATCH] - Allow for brltty users to start sgpemv2 from console (no X11 support) if they want, as promised git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1321 3ecf2c5c-341e-0410-92b4-d18e462d057c --- src/parse_opts.cc | 6 +++--- src/text_simulation.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/parse_opts.cc b/src/parse_opts.cc index b8d1d3f..4dcd1d6 100644 --- a/src/parse_opts.cc +++ b/src/parse_opts.cc @@ -99,7 +99,7 @@ parse_options(int argc, char** argv) try { // Parse options, initialising the Gtk::Main at the same time - Gtk::Main main_loop(argc, argv, context); + context.parse(argc, argv); GlobalPreferences& prefs = GlobalPreferences::get_instance(); try @@ -149,7 +149,7 @@ parse_options(int argc, char** argv) { // Enter main loop TextSimulation::parse_command(sim, str); - std::cout << std::endl << "% "; + std::cout << std::endl << "% "; // (Displays prompt) } } else @@ -157,7 +157,7 @@ parse_options(int argc, char** argv) GuiBuilder* gui = new GuiBuilder(); if (fnames.begin() != fnames.end()) gui->open_file(*fnames.begin()); - main_loop.run(gui->get_initial_window()); + Gtk::Main::run(gui->get_initial_window()); delete gui; } diff --git a/src/text_simulation.cc b/src/text_simulation.cc index 7b4f668..b86212b 100644 --- a/src/text_simulation.cc +++ b/src/text_simulation.cc @@ -656,7 +656,7 @@ TextSimulation::on_help(const Tokens& arguments) } if (command.size() == 0) - p_stdout(_("Avaiable commands:\nRUN\nSTOP\nPAUSE\n" + p_stdout(_("Available commands:\nRUN\nSTOP\nPAUSE\n" "CONFIGURE\nHELP\nGET\nSET\nSHOW\nADD\n" "REMOVE\nSAVE\nLOAD\nQUIT\n\n" "HELP followed by a command name shows help about it.\n"