diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-15 17:50:03 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-15 17:50:03 +0000 |
commit | a3b0f8c576796b97ff4ae96b5bae2186c3eb8a2c (patch) | |
tree | bcc8b61c49b4195e230e849978727ce9ea187563 /libs/gtkmm2ext/gtk_ui.cc | |
parent | 79910087b918c7df65f844063963b18f1d5eead6 (diff) |
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
Diffstat (limited to 'libs/gtkmm2ext/gtk_ui.cc')
-rw-r--r-- | libs/gtkmm2ext/gtk_ui.cc | 9 |
1 files changed, 5 insertions, 4 deletions
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 () { |