X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fgui_thread.h;h=76295a499f68c7941cc0a26cca846b4c8e3f1b94;hb=b754c4341e669729e29183abcd0857ec55eddb16;hp=16dc0600a15b3bb1e545ec0f4a2ad542495f729e;hpb=14b0ca31bcb62e5b7e9e77634ef9cd2e8cf65800;p=ardour.git diff --git a/gtk2_ardour/gui_thread.h b/gtk2_ardour/gui_thread.h index 16dc0600a1..76295a499f 100644 --- a/gtk2_ardour/gui_thread.h +++ b/gtk2_ardour/gui_thread.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2012 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,24 +17,4 @@ */ -#ifndef __ardour_gtk_gui_thread_h__ -#define __ardour_gtk_gui_thread_h__ - -#include -#include -#include -#include - -namespace sigc { - class trackable; -} - -#define ENSURE_GUI_THREAD(obj,method, ...) if (!Gtkmm2ext::UI::instance()->caller_is_self()) { abort (); } - -#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__)) - -extern PBD::EventLoop::InvalidationRecord* __invalidator (sigc::trackable& trackable, const char*, int); -#define invalidator(x) __invalidator ((x), __FILE__, __LINE__) - -#endif /* __ardour_gtk_gui_thread_h__ */ +#include "gtkmm2ext/gui_thread.h"