Merge branch 'windows+cc' into cairocanvas

diff --git a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
index 4a3eb7b5cfe8c7dc7099347df16033dca986b055..d82688c9c2332a94bda238f85d0d59c176cb18be 100644 (file)
--- 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 232b5b50a7597f4bd4d51940f20a260fef98773c..157cd59bef68575f3716626fe021b5a4dc21fec3 100644 (file)
--- 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 53c24847f3cc89ed7c09d9ccd1176284c48367b4..bdd83ad3e9f5d35030ec2ea87e20378cc72f5e0e 100644 (file)
--- 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 8d4f7bb61410c348029503acd9586d72885f7679..1e36868814f97898ac2e254e12854e59b0d88169 100644 (file)
--- 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);
        }