From a3b0f8c576796b97ff4ae96b5bae2186c3eb8a2c Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Fri, 15 Jan 2010 17:50:03 +0000
Subject: tidy up and abstract the GtkApplication concept a bit for OS X
 integration

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6496 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/gtkmm2ext/gtk_ui.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'libs/gtkmm2ext/gtk_ui.cc')

diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
index 8064b6cae7..25501a2119 100644
--- a/libs/gtkmm2ext/gtk_ui.cc
+++ b/libs/gtkmm2ext/gtk_ui.cc
@@ -33,7 +33,7 @@
 #include <pbd/pthread_utils.h>
 #include <pbd/stacktrace.h>
 
-#include <gtkmm2ext/gtkapplication.h>
+#include <gtkmm2ext/application.h>
 
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/textviewer.h>
@@ -62,7 +62,6 @@ BaseUI::RequestType Gtkmm2ext::AddTimeout = BaseUI::new_request_type();
 
 #include <pbd/abstract_ui.cc>  /* instantiate the template */
 
-
 UI::UI (string namestr, int *argc, char ***argv) 
 	: AbstractUI<UIRequest> (namestr, true)
 {
@@ -105,14 +104,16 @@ UI::UI (string namestr, int *argc, char ***argv)
 
 	register_thread (pthread_self(), X_("GUI"));
 
-	gtk_application_init ();
+	/* instantiate the Application singleton */
+
+	Application::instance();
 }
 
 UI::~UI ()
 {
+	delete Application::instance ();
 }
 
-
 bool
 UI::caller_is_ui_thread ()
 {
-- 
cgit v1.2.3