matteo/sgpemv2
matteo
/
sgpemv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Small changes: no need to use assert, since libGlade already 

does print a warning for us on error
- Fix Makefile


git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@740 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
tchernobog 2006-07-06 12:36:05 +00:00
parent f84c7bbf40
commit c1d104dba8
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -264,18 +264,19 @@ sgpemv2_LDADD = \
# Please keep this in sorted order: # Please keep this in sorted order:
sgpemv2_SOURCES = \ sgpemv2_SOURCES = \
src/graphical_terminal_io.cc \ src/graphical_terminal_io.cc \
src/gui_builder.cc \
src/main.cc \ src/main.cc \
src/main_window.cc \ src/main_window.cc \
src/observer.cc \ src/observer.cc \
src/parse_opts.cc \ src/parse_opts.cc \
src/simulation.cc \ src/simulation.cc \
src/standard_io.cc \ src/standard_io.cc \
src/start_gui.cc \
src/text_simulation.cc src/text_simulation.cc
noinst_HEADERS += \ noinst_HEADERS += \
src/graphical_simulation.hh \ src/graphical_simulation.hh \
src/graphical_terminal_io.hh \ src/graphical_terminal_io.hh \
src/gui_builder.hh \
src/io_manager.hh \ src/io_manager.hh \
src/main.hh \ src/main.hh \
src/main_window.hh \ src/main_window.hh \
@ -283,7 +284,6 @@ noinst_HEADERS += \
src/parse_opts.hh \ src/parse_opts.hh \
src/simulation.hh \ src/simulation.hh \
src/standard_io.hh \ src/standard_io.hh \
src/start_gui.hh \
src/text_simulation.hh src/text_simulation.hh
# ---------- glade files ----------- # ---------- glade files -----------

7
src/gui_builder.cc
View File

@ -28,7 +28,6 @@
#include <gtkmm/main.h> #include <gtkmm/main.h>
#include <gtkmm/menuitem.h> #include <gtkmm/menuitem.h>
#include <cassert>
#include <iostream> #include <iostream>
using namespace sgpem; using namespace sgpem;
@ -47,19 +46,14 @@ GuiBuilder::GuiBuilder(const std::string& gladefile)
// Glade::Xml::get_widget_derived -- better --) // Glade::Xml::get_widget_derived -- better --)
MenuItem* file_quit = NULL; MenuItem* file_quit = NULL;
_refXml->get_widget("MenuItem.File.Quit", file_quit); _refXml->get_widget("MenuItem.File.Quit", file_quit);
assert(file_quit != NULL);
file_quit->signal_activate().connect(sigc::ptr_fun(&Main::quit)); file_quit->signal_activate().connect(sigc::ptr_fun(&Main::quit));
// About dialog // About dialog
MenuItem* help_about = NULL; MenuItem* help_about = NULL;
_refXml->get_widget("MenuItem.Help.About", help_about); _refXml->get_widget("MenuItem.Help.About", help_about);
assert(help_about != NULL);
AboutDialog* about_dialog = NULL; AboutDialog* about_dialog = NULL;
_refXml->get_widget("AboutDialog", about_dialog); _refXml->get_widget("AboutDialog", about_dialog);
assert(about_dialog != NULL);
help_about->signal_activate().connect(sigc::mem_fun(*about_dialog, &Window::show)); help_about->signal_activate().connect(sigc::mem_fun(*about_dialog, &Window::show));
// main_window.show_all_children();
} }
@ -73,7 +67,6 @@ GuiBuilder::get_initial_window() const
{ {
Gtk::Window* main_window = NULL; Gtk::Window* main_window = NULL;
_refXml->get_widget("MainWindow", main_window); _refXml->get_widget("MainWindow", main_window);
assert(main_window != NULL);
return *main_window; return *main_window;
} }