projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a couple of visibility specifiers that were missing
[ardour.git]
/
libs
/
gtkmm2ext
/
gtk_ui.cc
diff --git
a/libs/gtkmm2ext/gtk_ui.cc
b/libs/gtkmm2ext/gtk_ui.cc
index 6e466f5c9f587b5a120b7406254e2e37653566be..33841cd0beb6821c61a5927c2a848437e1eeb2f7 100644
(file)
--- a/
libs/gtkmm2ext/gtk_ui.cc
+++ b/
libs/gtkmm2ext/gtk_ui.cc
@@
-43,6
+43,7
@@
#include "gtkmm2ext/actions.h"
#include "gtkmm2ext/activatable.h"
#include "gtkmm2ext/actions.h"
#include "gtkmm2ext/actions.h"
#include "gtkmm2ext/activatable.h"
#include "gtkmm2ext/actions.h"
+#include "gtkmm2ext/gui_thread.h"
#include "i18n.h"
#include "i18n.h"
@@
-94,7
+95,7
@@
UI::UI (string namestr, int *argc, char ***argv)
/* attach our request source to the default main context */
/* attach our request source to the default main context */
-
request_channel.ios()->attach (MainContext::get_default()
);
+
attach_request_source (
);
errors = new TextViewer (800,600);
errors->text().set_editable (false);
errors = new TextViewer (800,600);
errors->text().set_editable (false);
@@
-120,9
+121,9
@@
UI::UI (string namestr, int *argc, char ***argv)
UI::~UI ()
{
UI::~UI ()
{
+ _receiver.hangup ();
}
}
-
bool
UI::caller_is_ui_thread ()
{
bool
UI::caller_is_ui_thread ()
{
@@
-265,12
+266,14
@@
UI::run (Receiver &old_receiver)
Glib::signal_idle().connect (bind_return (mem_fun (old_receiver, &Receiver::hangup), false));
Glib::signal_idle().connect (bind_return (mem_fun (old_receiver, &Receiver::hangup), false));
- starting ();
+ if (starting ()) {
+ return;
+ }
+
_active = true;
theMain->run ();
_active = false;
_active = true;
theMain->run ();
_active = false;
- stopping ();
- _receiver.hangup ();
+
return;
}
return;
}
@@
-689,7
+692,7
@@
UI::flush_pending ()
}
bool
}
bool
-UI::just_hide_it (GdkEventAny
*
/*ev*/, Window *win)
+UI::just_hide_it (GdkEventAny
*
/*ev*/, Window *win)
{
win->hide ();
return true;
{
win->hide ();
return true;
@@
-739,7
+742,7
@@
UI::color_selection_done (bool status)
}
bool
}
bool
-UI::color_selection_deleted (GdkEventAny
*
/*ev*/)
+UI::color_selection_deleted (GdkEventAny
*
/*ev*/)
{
Main::quit ();
return true;
{
Main::quit ();
return true;