fix a compile of annoying compiler warnings with elcap clang

[ardour.git] / gtk2_ardour / gui_thread.h

diff --git a/gtk2_ardour/gui_thread.h b/gtk2_ardour/gui_thread.h
index 12071c5558889b289af497e893ff676201c8b7ad..76295a499f68c7941cc0a26cca846b4c8e3f1b94 100644 (file)
--- 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,20 +17,4 @@
 
 */
 
-#ifndef __ardour_gtk_gui_thread_h__
-#define __ardour_gtk_gui_thread_h__
-
-#include <gtkmm2ext/gtk_ui.h>
-#include "pbd/crossthread.h"
-
-#define ENSURE_GUI_THREAD(slot) \
-     if (!Gtkmm2ext::UI::instance()->caller_is_ui_thread()) {\
-       Gtkmm2ext::UI::instance()->call_slot ((slot));\
-        return;\
-     }
-
-#define GTK_SAFE(theSlot) crossthread_safe (Gtkmm2ext::UI::instance()->thread_id(),\
-                                           *Gtkmm2ext::UI::instance(), \
-                                           (theSlot))
-
-#endif /* __ardour_gtk_gui_thread_h__ */
+#include "gtkmm2ext/gui_thread.h"