#ifndef __ardour_gtk_gui_thread_h__
#define __ardour_gtk_gui_thread_h__
+#include <cstdlib>
#include <gtkmm2ext/gtk_ui.h>
-#include "pbd/crossthread.h"
+#include <boost/bind.hpp>
+#include <boost/bind/protect.hpp>
-#define ENSURE_GUI_THREAD(slot) \
- if (!Gtkmm2ext::UI::instance()->caller_is_ui_thread()) {\
- Gtkmm2ext::UI::instance()->call_slot ((slot));\
- return;\
- }
+#define ENSURE_GUI_THREAD(obj,method, ...) if (!Gtkmm2ext::UI::instance()->caller_is_self()) { abort (); }
-#define GTK_SAFE(theSlot) crossthread_safe (Gtkmm2ext::UI::instance()->thread_id(),\
- *Gtkmm2ext::UI::instance(), \
- (theSlot))
+#define gui_context() Gtkmm2ext::UI::instance() /* a UICallback-derived object that specifies the event loop for GUI signal handling */
+#define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__))
#endif /* __ardour_gtk_gui_thread_h__ */