diff options
author | John Emmas <johne53@tiscali.co.uk> | 2014-01-20 18:18:21 +0000 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2014-01-20 18:18:21 +0000 |
commit | 25a6296f865620d5013cd634e693f7179e7edc84 (patch) | |
tree | 8a93abe396dd7173a94028c4bf9c9e0af0d5ef02 /libs | |
parent | 5451b5fb13e4b9fe4d16b937b9a52d8be46e5ec6 (diff) | |
parent | bd16d6afeadc4fc222c3fca1a10911e090912856 (diff) |
Merge branch 'windows+cc' into cairocanvas
Diffstat (limited to 'libs')
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/dndtreeview.h | 4 | ||||
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/dndvbox.h | 4 | ||||
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/doi.h | 6 | ||||
-rw-r--r-- | 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<class DataType> -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 DataType> -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 232b5b50a7..157cd59bef 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 T> -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<typename T> LIBGTKMM2EXT_API gint idle_delete (T *obj) { delete obj; return FALSE; } -template<typename T> LIBGTKMM2EXT_API 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> LIBGTKMM2EXT_API 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; } diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h index 8d4f7bb614..1e36868814 100644 --- a/libs/gtkmm2ext/gtkmm2ext/utils.h +++ b/libs/gtkmm2ext/gtkmm2ext/utils.h @@ -79,7 +79,7 @@ namespace Gtkmm2ext { LIBGTKMM2EXT_API void set_popdown_strings (Gtk::ComboBoxText&, const std::vector<std::string>&); - template<class T> LIBGTKMM2EXT_API void deferred_delete (void *ptr) { + template<class T> /*LIBGTKMM2EXT_API*/ void deferred_delete (void *ptr) { delete static_cast<T *> (ptr); } |