From f357827e113ca2d3c3f9758ec572bd8325cc5847 Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt Date: Sun, 2 Apr 2023 15:05:14 +0200 Subject: Glib: NodeTree etc.: Use callback functions with C linkage * glib/glibmm/class.cc: Use glibmm_custom_[get|set]_property_callback(). * glib/glibmm/object.[cc|h]: Add set_data_with_c_callback(). Don't call g_object_set_qdata_full() with a function with C++ linkage, if GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS is defined. * glib/glibmm/property.[cc|h]: Declare some local functions extern "C". Add glibmm_custom_[get|set]_property_callback(). * glib/src/nodetree.[ccg|hg]: Add glibmm_NodeTree_c_callback_[traverse|foreach]() and struct NodeTreeCallback[Traverse|Foreach]Data. Part of issue #1 --- glib/glibmm/class.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'glib/glibmm/class.cc') diff --git a/glib/glibmm/class.cc b/glib/glibmm/class.cc index 5344f381..1080f1ce 100644 --- a/glib/glibmm/class.cc +++ b/glib/glibmm/class.cc @@ -233,8 +233,8 @@ Class::custom_class_init_function(void* g_class, void* class_data) (*init_func)(g_class, nullptr); GObjectClass* const gobject_class = static_cast(g_class); - gobject_class->get_property = &Glib::custom_get_property_callback; - gobject_class->set_property = &Glib::custom_set_property_callback; + gobject_class->get_property = &Glib::glibmm_custom_get_property_callback; + gobject_class->set_property = &Glib::glibmm_custom_set_property_callback; // Call extra class init functions, if any. for (std::size_t i = 1; i < class_init_funcs.size(); ++i) @@ -277,7 +277,8 @@ Class::custom_class_init_function(void* g_class, void* class_data) // Override only properties which have not been overridden in a base class. // Store the default values belonging to the class. - // They are copied to an object in custom_set_property_callback() in property.cc. + // They are copied to an object in glibmm_custom_set_property_callback() + // in property.cc. if (!g_object_class_find_property(gobject_class, prop_name)) { GValue* g_value = g_new0(GValue, 1); -- cgit v1.2.1