merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.

Still need to add API export/visibility macros for the canvas library.

1 files changed, 5 insertions, 3 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/doi.h b/libs/gtkmm2ext/gtkmm2ext/doi.h
index 6ad1f7dd94..e24224701f 100644
--- a/libs/gtkmm2ext/gtkmm2ext/doi.h
+++ b/libs/gtkmm2ext/gtkmm2ext/doi.h
@@ -22,13 +22,15 @@
 
 #include <gtkmm.h>
 
+#include "gtkmm2ext/visibility.h"
+
 /* XXX g++ 2.95 can't compile this as pair of member function templates */
 
-template<typename T> gint idle_delete (T *obj) { delete obj; return FALSE; }
-template<typename T> void delete_when_idle (T *obj) {
+template<typename T> LIBGTKMM2EXT_API gint idle_delete (T *obj) { delete obj; return FALSE; }
+template<typename T> LIBGTKMM2EXT_API void delete_when_idle (T *obj) {
 	Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (idle_delete<T>), obj));
 }
-template<typename T> gint delete_on_unmap (GdkEventAny *ignored, T *obj) {
+template<typename T> LIBGTKMM2EXT_API gint delete_on_unmap (GdkEventAny *ignored, T *obj) {
 	Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (idle_delete<T>), obj));
 	return FALSE;
 }