add new sigc++2 directory

[ardour.git] / libs / gtkmm2 / atk / atkmm / implementor.cc

diff --git a/libs/gtkmm2/atk/atkmm/implementor.cc b/libs/gtkmm2/atk/atkmm/implementor.cc
index 303bf3d0a147f4177fcf3b5fe6d82845d3fde5de..91d9bb51b0df5f4f0cadcbfdbb747275b1fe848b 100644 (file)
--- a/libs/gtkmm2/atk/atkmm/implementor.cc
+++ b/libs/gtkmm2/atk/atkmm/implementor.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/implementor.h>
 #include <atkmm/private/implementor_p.h>
 
@@ -37,7 +38,7 @@ namespace Glib
 
 Glib::RefPtr<Atk::Implementor> wrap(AtkImplementor* object, bool take_copy)
 {
-  return Glib::RefPtr<Atk::Implementor>( dynamic_cast<Atk::Implementor*> (Glib::wrap_auto ((GObject*)(object), take_copy)) );
+  return Glib::RefPtr<Atk::Implementor>( dynamic_cast<Atk::Implementor*> (Glib::wrap_auto_interface<Atk::Implementor> ((GObject*)(object), take_copy)) );
   //We use dynamic_cast<> in case of multiple inheritance.
 }
 
@@ -73,12 +74,18 @@ void Implementor_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->ref_accessible = &ref_accessible_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 AtkObject* Implementor_Class::ref_accessible_vfunc_callback(AtkImplementor* self)
 {
-  CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+  Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
       Glib::ObjectBase::_get_current_wrapper((GObject*)self));
 
   // Non-gtkmmproc-generated custom classes implicitly call the default
@@ -86,33 +93,44 @@ AtkObject* Implementor_Class::ref_accessible_vfunc_callback(AtkImplementor* self
   // generated classes can use this optimisation, which avoids the unnecessary
   // parameter conversions if there is no possibility of the virtual function
   // being overridden:
-  if(obj && obj->is_derived_())
+  if(obj_base && obj_base->is_derived_())
   {
-    try // Trap C++ exceptions which would normally be lost because this is a C callback.
-    {
-      // Call the virtual member method, which derived classes might override.
-      return Glib::unwrap(obj->ref_accessibile_vfunc());
-    }
-    catch(...)
+    CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+    if(obj) // This can be NULL during destruction.
     {
-      Glib::exception_handlers_invoke();
+      #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 Glib::unwrap(obj->ref_accessibile_vfunc());
+      #ifdef GLIBMM_EXCEPTIONS_ENABLED
+      }
+      catch(...)
+      {
+        Glib::exception_handlers_invoke();
+      }
+      #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  else
-  {
-    BaseClassType *const base = static_cast<BaseClassType*>(
-        g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface).
+  
+  BaseClassType *const base = static_cast<BaseClassType*>(
+      g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface).
 g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface.
-)    );
+)  );
+
+  // Call the original underlying C function:
+  if(base && base->ref_accessible)
+    return (*base->ref_accessible)(self);
 
-    // Call the original underlying C function:
-    if(base && base->ref_accessible)
-      return (*base->ref_accessible)(self);
-  }
 
   typedef AtkObject* RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Implementor_Class::wrap_new(GObject* object)
@@ -155,6 +173,10 @@ GType Implementor::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 Glib::RefPtr<Object> Atk::Implementor::ref_accessibile_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -163,11 +185,12 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
 )  );
 
   if(base && base->ref_accessible)
-    return Glib::wrap((*base->ref_accessible)(gobj()));
+    return Glib::wrap((*base->ref_accessible)(gobj()), true);
 
   typedef Glib::RefPtr<Object> RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk