summaryrefslogtreecommitdiffstats
path: root/src/Gui/Window.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Gui/Window.cpp')
-rw-r--r--src/Gui/Window.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp
index 6d614fb..dcc8f45 100644
--- a/src/Gui/Window.cpp
+++ b/src/Gui/Window.cpp
@@ -21,16 +21,22 @@
#include "RenderArea.h"
#include "AspectFrame.h"
+#include <gtkmm/action.h>
+
namespace ZoomEdit {
namespace Gui {
-Window::Window(BaseObjectType *cobject, const Glib::RefPtr<Gnome::Glade::Xml> &xml)
+Window::Window(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder> &builder)
: Gtk::Window(cobject) {
- xml->connect_clicked("MenuItemQuit", sigc::mem_fun(this, &Window::hide));
- xml->get_widget_derived("RenderArea", renderArea);
- xml->get_widget_derived("MapArea", mapArea);
- xml->get_widget_derived("AspectFrameMap", aspectFrameMap);
+ Glib::RefPtr<Gtk::Action> itemQuit = Glib::RefPtr<Gtk::Action>::cast_dynamic(builder->get_object("MenuItemQuit"));
+ if(itemQuit) {
+ itemQuit->signal_activate().connect(sigc::mem_fun(this, &Window::hide));
+ }
+
+ builder->get_widget_derived("RenderArea", renderArea);
+ builder->get_widget_derived("MapArea", mapArea);
+ builder->get_widget_derived("AspectFrameMap", aspectFrameMap);
}
Window::~Window() {