Upgrade gtkmm to 2.10.8, glibmm to 2.13.3 and add cairomm 1.2.4

git-svn-id: svn://localhost/ardour2/trunk@2630 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 24 insertions, 2 deletions

diff --git a/libs/gtkmm2/atk/atkmm/document.cc b/libs/gtkmm2/atk/atkmm/document.cc
index 64946c6f84..f27b4ff522 100644
--- a/libs/gtkmm2/atk/atkmm/document.cc
+++ b/libs/gtkmm2/atk/atkmm/document.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/document.h>
 #include <atkmm/private/document_p.h>
 
@@ -80,10 +81,16 @@ void Document_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->get_document_type = &get_document_type_vfunc_callback;
   klass->get_document = &get_document_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 const gchar* Document_Class::get_document_type_vfunc_callback(AtkDocument* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -96,15 +103,19 @@ const gchar* Document_Class::get_document_type_vfunc_callback(AtkDocument* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_document_type_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -121,7 +132,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef const gchar* RType;
   return RType();
 }
-
 gpointer Document_Class::get_document_vfunc_callback(AtkDocument* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -134,15 +144,19 @@ gpointer Document_Class::get_document_vfunc_callback(AtkDocument* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_document_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -159,6 +173,10 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gpointer RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Document_Class::wrap_new(GObject* object)
@@ -212,6 +230,10 @@ gpointer Document::get_document()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 const gchar* Atk::Document::get_document_type_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -225,7 +247,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef const gchar* RType;
   return RType();
 }
-
 gpointer Atk::Document::get_document_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -239,6 +260,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef gpointer RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk