From b5e9e7c04c6f0514dcdf3be8e02eb1ce75dd8fb8 Mon Sep 17 00:00:00 2001 From: John Emmas Date: Mon, 20 Jan 2014 17:01:58 +0000 Subject: [PATCH] 'libs/gtkmm2ext' - DLL visibility stuff and associated changes needed for building with MSVC. Currently includes debugging information and things that are just commented out until we have known compatibility with the other platforms (i.e. contains stuff to be removed at a later date) --- libs/gtkmm2ext/gtkmm2ext/dndtreeview.h | 4 ++-- libs/gtkmm2ext/gtkmm2ext/dndvbox.h | 4 ++-- libs/gtkmm2ext/gtkmm2ext/doi.h | 6 +++--- libs/gtkmm2ext/gtkmm2ext/utils.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h index 4a3eb7b5cf..d82688c9c2 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h @@ -31,7 +31,7 @@ namespace Gtkmm2ext { template -struct LIBGTKMM2EXT_API SerializedObjectPointers { +struct /*LIBGTKMM2EXT_API*/ SerializedObjectPointers { uint32_t size; uint32_t cnt; char type[32]; @@ -89,7 +89,7 @@ class LIBGTKMM2EXT_API DnDTreeViewBase : public Gtk::TreeView }; template -class LIBGTKMM2EXT_API DnDTreeView : public DnDTreeViewBase +class /*LIBGTKMM2EXT_API*/ DnDTreeView : public DnDTreeViewBase { public: DnDTreeView() {} diff --git a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h index e41437fbcc..da6690f5f9 100644 --- a/libs/gtkmm2ext/gtkmm2ext/dndvbox.h +++ b/libs/gtkmm2ext/gtkmm2ext/dndvbox.h @@ -25,7 +25,7 @@ namespace Gtkmm2ext { /** Parent class for children of a DnDVBox */ -class LIBGTKMM2EXT_API DnDVBoxChild +class /*LIBGTKMM2EXT_API*/ DnDVBoxChild { public: virtual ~DnDVBoxChild () {} @@ -45,7 +45,7 @@ public: /** A VBox whose contents can be dragged and dropped */ template -class LIBGTKMM2EXT_API DnDVBox : public Gtk::EventBox +class /*LIBGTKMM2EXT_API*/ DnDVBox : public Gtk::EventBox { public: DnDVBox () : _active (0), _drag_icon (0), _expecting_unwanted_button_event (false), _placeholder (0) diff --git a/libs/gtkmm2ext/gtkmm2ext/doi.h b/libs/gtkmm2ext/gtkmm2ext/doi.h index 53c24847f3..bdd83ad3e9 100644 --- a/libs/gtkmm2ext/gtkmm2ext/doi.h +++ b/libs/gtkmm2ext/gtkmm2ext/doi.h @@ -30,11 +30,11 @@ /* XXX g++ 2.95 can't compile this as pair of member function templates */ -template LIBGTKMM2EXT_API gint idle_delete (T *obj) { delete obj; return FALSE; } -template LIBGTKMM2EXT_API void delete_when_idle (T *obj) { +template /*LIBGTKMM2EXT_API*/ gint idle_delete (T *obj) { delete obj; return FALSE; } +template /*LIBGTKMM2EXT_API*/ void delete_when_idle (T *obj) { Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (idle_delete), obj)); } -template LIBGTKMM2EXT_API gint delete_on_unmap (GdkEventAny *ignored, T *obj) { +template /*LIBGTKMM2EXT_API*/ gint delete_on_unmap (GdkEventAny *ignored, T *obj) { Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (idle_delete), obj)); return FALSE; } diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h index 7d161e2518..de939bb136 100644 --- a/libs/gtkmm2ext/gtkmm2ext/utils.h +++ b/libs/gtkmm2ext/gtkmm2ext/utils.h @@ -75,7 +75,7 @@ namespace Gtkmm2ext { LIBGTKMM2EXT_API void set_popdown_strings (Gtk::ComboBoxText&, const std::vector&); - template LIBGTKMM2EXT_API void deferred_delete (void *ptr) { + template /*LIBGTKMM2EXT_API*/ void deferred_delete (void *ptr) { delete static_cast (ptr); }