[gtkmm] Container: forall_vfunc(): Remove include_internals parameter.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Container: forall_vfunc(): Remove include_internals parameter.
- Date: Thu, 27 Apr 2017 10:23:14 +0000 (UTC)
commit 897fd7329b84208875852d646e4cd6940253555e
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Apr 27 11:08:46 2017 +0200
Container: forall_vfunc(): Remove include_internals parameter.
See the change in GTK+:
https://git.gnome.org/browse/gtk+/commit/?id=f053a63d7480d1b15e4d556ba48461ee3426dc49
gtk/src/container.ccg | 8 ++++----
gtk/src/container.hg | 3 +--
gtk/src/gtk_vfuncs.defs | 1 -
3 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/gtk/src/container.ccg b/gtk/src/container.ccg
index 1d525c7..b3ea4fe 100644
--- a/gtk/src/container.ccg
+++ b/gtk/src/container.ccg
@@ -169,7 +169,7 @@ void Container_Class::remove_callback(GtkContainer* self, GtkWidget* p0)
// Custom hand-coded callback:
void Container_Class::forall_vfunc_callback(GtkContainer* self,
- gboolean include_internals, GtkCallback callback, gpointer callback_data)
+ GtkCallback callback, gpointer callback_data)
{
const auto obj_base = static_cast<Glib::ObjectBase*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
@@ -194,7 +194,7 @@ void Container_Class::forall_vfunc_callback(GtkContainer* self,
const auto slot = static_cast<Container::ForeachSlot*>(callback_data);
// Call the virtual member method, which derived classes might override.
- obj->forall_vfunc(include_internals, *slot);
+ obj->forall_vfunc(*slot);
}
else
{
@@ -203,7 +203,7 @@ void Container_Class::forall_vfunc_callback(GtkContainer* self,
{ callback(widget.gobj(), callback_data); };
// Call the virtual member method, which derived classes might override.
- obj->forall_vfunc(include_internals, slot);
+ obj->forall_vfunc(slot);
}
return;
}
@@ -220,7 +220,7 @@ void Container_Class::forall_vfunc_callback(GtkContainer* self,
// Call the original underlying C function:
if(base && base->forall)
- (*base->forall)(self, include_internals, callback, callback_data);
+ (*base->forall)(self, callback, callback_data);
}
void Container::foreach(const Container::ForeachSlot& slot)
diff --git a/gtk/src/container.hg b/gtk/src/container.hg
index bc6a251..effcd99 100644
--- a/gtk/src/container.hg
+++ b/gtk/src/container.hg
@@ -180,10 +180,9 @@ protected:
*
* Most applications should use foreach(), rather than forall().
*
- * @param include_internals
* @param slot A slot to call for each child.
*/
- _WRAP_VFUNC(void forall(bool include_internals, const ForeachSlot& slot{callback}), forall,
+ _WRAP_VFUNC(void forall(const ForeachSlot& slot{callback}), forall,
custom_vfunc_callback, slot_name slot, slot_callback container_foreach_callback, no_slot_copy)
/** Sets a child property for this container and its child.
diff --git a/gtk/src/gtk_vfuncs.defs b/gtk/src/gtk_vfuncs.defs
index 0675213..b0a62aa 100644
--- a/gtk/src/gtk_vfuncs.defs
+++ b/gtk/src/gtk_vfuncs.defs
@@ -285,7 +285,6 @@
(of-object "GtkContainer")
(return-type "none")
(parameters
- '("gboolean" "include_internals")
'("GtkCallback" "callback")
'("gpointer" "callback_data")
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]