Merged revisions 6293,6296-6306,6308 via svnmerge from

[ardour.git] / libs / gtkmm2 / gtk / gtkmm / object.cc

diff --git a/libs/gtkmm2/gtk/gtkmm/object.cc b/libs/gtkmm2/gtk/gtkmm/object.cc
index b61a028949b860b5df1fc322aa514263f51eb299..cddd6759c2fe0f98e612d16f51e8acc173b5a52e 100644 (file)
--- a/libs/gtkmm2/gtk/gtkmm/object.cc
+++ b/libs/gtkmm2/gtk/gtkmm/object.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/object.h>
 #include <gtkmm/private/object_p.h>
 
@@ -59,11 +60,10 @@ void Object::_init_unmanage(bool /* is_toplevel = false */)
 
     // Most GTK+ objects are floating, by default. This means that the container widget controls their lifetime.
     // We'll change this:
-    if(GTK_OBJECT_FLOATING (gobject_)) //Top-level Windows and Dialogs can not be manag()ed, so there is no need to do this.
+    if(g_object_is_floating (gobject_)) //Top-level Windows and Dialogs can not be manag()ed, so there is no need to do this.
     {
       GLIBMM_DEBUG_REFERENCE(this, gobject_);
-      g_object_ref(gobject_);  //Increase ref by 1 so that it doesn't get deleted when we sink() it (sink()ing does an unref)
-      gtk_object_sink((GtkObject*)gobject_); //Stops it from being floating - we will make this optional ( see Gtk::manage() ),
+      g_object_ref_sink(gobject_); //Stops it from being floating - we will make this optional ( see Gtk::manage() ),
 
       #ifdef GLIBMM_DEBUG_REFCOUNTING
       g_warning("gtkmm after sink: C++ instance: %p, C instance: %p, refcount=%d\n", (void*)(Glib::ObjectBase*)this, (void*)gobject_, G_OBJECT(gobject_)->ref_count);
@@ -75,7 +75,7 @@ void Object::_init_unmanage(bool /* is_toplevel = false */)
     else
     {
        //This widget is already not floating. It's probably already been added to a GTK+ container, and has just had Glib::wrap() called on it.
-       //It's not floating because containers call gtk_object_sink() on child widgets to take control of them.
+       //It's not floating because containers call g_object_sink() on child widgets to take control of them.
        //We just ref() it so that we can unref it later.
        //GLIBMM_DEBUG_REFERENCE(this, gobject_);
        //g_object_ref(gobject_);
@@ -285,7 +285,8 @@ void Object::set_manage()
       g_warning("Object::set_manage(): setting GTK_FLOATING: gobject_ = %p", (void*) gobj());
       g_warning("  gtypename=%s\n", G_OBJECT_TYPE_NAME(gobj()));
     #endif
-    GTK_OBJECT_SET_FLAGS(gobj(), GTK_FLOATING);
+    //deprecated: GTK_OBJECT_SET_FLAGS(gobj(), GTK_FLOATING);
+    g_object_force_floating(gobject_);
   }
   else
   {
@@ -366,8 +367,19 @@ void Object_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Object_Class::wrap_new(GObject* o)
 {
@@ -391,15 +403,26 @@ GType Object::get_base_type()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<void*> Object::property_user_data() 
 {
   return Glib::PropertyProxy<void*>(this, "user-data");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<void*> Object::property_user_data() const
 {
   return Glib::PropertyProxy_ReadOnly<void*>(this, "user-data");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk