diff options
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 () { |