diff options
Diffstat (limited to 'src/Instance.cpp')
| -rw-r--r-- | src/Instance.cpp | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/src/Instance.cpp b/src/Instance.cpp index 351a6d7..ce0d239 100644 --- a/src/Instance.cpp +++ b/src/Instance.cpp @@ -35,29 +35,17 @@ guint Instance::instances = 0; Instance::Instance(const Glib::ustring &file) : window(0), levelXml(0), level(0), view(0) { instances++; -#ifdef GLIBMM_EXCEPTIONS_ENABLED - try - { - xml = Gnome::Glade::Xml::create("zoomedit.glade"); + try { + builder = Gtk::Builder::create_from_file("zoomedit.ui"); } - catch(const Gnome::Glade::XmlError& ex) - { + catch(const Glib::Exception& ex) { std::cerr << ex.what() << std::endl; return; } -#else - std::auto_ptr<Gnome::Glade::XmlError> error; - xml = Gnome::Glade::Xml::create("zoomedit.glade", "", "", error); - if(error.get()) - { - std::cerr << error->what() << std::endl; - return; - } -#endif - xml->get_widget_derived("WindowMain", window); + builder->get_widget_derived("WindowMain", window); if(!window) { - xml.clear(); + builder.clear(); return; } @@ -70,10 +58,10 @@ Instance::Instance(const Glib::ustring &file) : window(0), levelXml(0), level(0) window->getMapArea()->setView(mapView); Gtk::ToolButton *button; - xml->get_widget("ToolButtonZoomIn", button); + builder->get_widget("ToolButtonZoomIn", button); button->signal_clicked().connect(sigc::bind(sigc::mem_fun(view, &View::TopView::zoom), 2, 0, 0)); - xml->get_widget("ToolButtonZoomOut", button); + builder->get_widget("ToolButtonZoomOut", button); button->signal_clicked().connect(sigc::bind(sigc::mem_fun(view, &View::TopView::zoom), -2, 0, 0)); if(file.empty()) |