[gtk+] Drop with_separators from gtk_popover_bind_model
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Drop with_separators from gtk_popover_bind_model
- Date: Mon, 17 Feb 2014 11:52:56 +0000 (UTC)
commit 72e2094472e1183c1d2c7f7b88c778bbd9f5823f
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Feb 17 06:50:25 2014 -0500
Drop with_separators from gtk_popover_bind_model
The with_separators argument does not really make sense
for popovers, it was just copied from the menu implementation.
Drop it now, before it becomes part of the public API.
gtk/gtkpopover.c | 18 ++++--------------
gtk/gtkpopover.h | 3 +--
2 files changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 3c56cbb..05a8380 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -2054,8 +2054,6 @@ back_to_main (GtkWidget *popover)
* @model: (allow-none): the #GMenuModel to bind to or %NULL to remove
* binding
* @action_namespace: (allow-none): the namespace for actions in @model
- * @with_separators: %TRUE if toplevel items in @popover should have
- * separators between them
*
* Establishes a binding between a #GtkPopover and a #GMenuModel.
*
@@ -2066,13 +2064,6 @@ back_to_main (GtkWidget *popover)
* model. If @model is %NULL then any previous binding is undone and
* all children are removed.
*
- * Individual items in @model are represented by #GtkModelButton widgets,
- * while submenus are represented by #GtkStack widgets.
- *
- * @with_separators determines if toplevel items (eg: sections) have
- * separators inserted between them. This is typically desired for
- * menus but doesn’t make sense for menubars.
- *
* If @action_namespace is non-%NULL then the effect is as if all
* actions mentioned in the @model have their names prefixed with the
* namespace, plus a dot. For example, if the action “quit” is
@@ -2094,8 +2085,7 @@ back_to_main (GtkWidget *popover)
void
gtk_popover_bind_model (GtkPopover *popover,
GMenuModel *model,
- const gchar *action_namespace,
- gboolean with_separators)
+ const gchar *action_namespace)
{
GtkActionMuxer *muxer;
GtkWidget *child;
@@ -2138,7 +2128,7 @@ gtk_popover_bind_model (GtkPopover *popover,
priv->tracker = gtk_menu_tracker_new (GTK_ACTION_OBSERVABLE (muxer),
model,
- with_separators,
+ TRUE,
action_namespace,
gtk_popover_tracker_insert_func,
gtk_popover_tracker_remove_func,
@@ -2152,7 +2142,7 @@ gtk_popover_bind_model (GtkPopover *popover,
* @model: a #GMenuModel
*
* Creates a #GtkPopover and populates it according to
- * @model. The popover is pointed to the @relative_to wideget.
+ * @model. The popover is pointed to the @relative_to widget.
*
* The created buttons are connected to actions found in the
* #GtkApplicationWindow to which the popover belongs - typically
@@ -2175,7 +2165,7 @@ gtk_popover_new_from_model (GtkWidget *relative_to,
g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL);
popover = gtk_popover_new (relative_to);
- gtk_popover_bind_model (GTK_POPOVER (popover), model, NULL, TRUE);
+ gtk_popover_bind_model (GTK_POPOVER (popover), model, NULL);
return popover;
}
diff --git a/gtk/gtkpopover.h b/gtk/gtkpopover.h
index 68f4b5b..d4baf82 100644
--- a/gtk/gtkpopover.h
+++ b/gtk/gtkpopover.h
@@ -95,8 +95,7 @@ gboolean gtk_popover_get_modal (GtkPopover *popover);
GDK_AVAILABLE_IN_3_12
void gtk_popover_bind_model (GtkPopover *popover,
GMenuModel *model,
- const gchar *action_namespace,
- gboolean with_separators);
+ const gchar *action_namespace);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]