diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-05-02 11:33:10 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-05-04 22:53:07 -0400 |
| commit | b9b1bf85e19fb31fcff2ab6b0dce8d0fffea7e01 (patch) | |
| tree | 3272c8dfc2ee138b65b3a80c886fa0aa0084172b | |
| parent | 4aa5fba0b59dd685f64cfee799a14ef76aac6d04 (diff) | |
| download | gtk+-b9b1bf85e19fb31fcff2ab6b0dce8d0fffea7e01.tar.gz | |
window: Add a child property
| -rw-r--r-- | docs/reference/gtk/gtk4-sections.txt | 2 | ||||
| -rw-r--r-- | gtk/gtkwindow.c | 49 | ||||
| -rw-r--r-- | gtk/gtkwindow.h | 6 |
3 files changed, 57 insertions, 0 deletions
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 4e65cbb834..55364be75a 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -4203,6 +4203,8 @@ gtk_requisition_get_type GtkWindow GtkWindowClass gtk_window_new +gtk_window_get_child +gtk_window_set_child gtk_window_set_title gtk_window_set_resizable gtk_window_get_resizable diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 518d9518f5..e18d46a0c2 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -293,6 +293,7 @@ enum { PROP_APPLICATION, PROP_DEFAULT_WIDGET, PROP_FOCUS_WIDGET, + PROP_CHILD, /* Readonly properties */ PROP_IS_ACTIVE, @@ -961,6 +962,14 @@ gtk_window_class_init (GtkWindowClass *klass) GTK_TYPE_WIDGET, GTK_PARAM_READWRITE|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY); + window_props[PROP_CHILD] = + g_param_spec_object ("child", + P_("Child"), + P_("The child widget"), + GTK_TYPE_WIDGET, + GTK_PARAM_READWRITE|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY); + + g_object_class_install_properties (gobject_class, LAST_ARG, window_props); /** @@ -1937,6 +1946,9 @@ gtk_window_set_property (GObject *object, case PROP_FOCUS_WIDGET: gtk_window_set_focus (window, g_value_get_object (value)); break; + case PROP_CHILD: + gtk_window_set_child (window, g_value_get_object (value)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -2020,6 +2032,9 @@ gtk_window_get_property (GObject *object, case PROP_FOCUS_WIDGET: g_value_set_object (value, gtk_window_get_focus (window)); break; + case PROP_CHILD: + g_value_set_object (value, gtk_window_get_child (window)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -8070,3 +8085,37 @@ gtk_window_maybe_update_cursor (GtkWindow *window, break; } } + +/** + * gtk_window_set_child: + * @window: a #GtkWindow + * @child: (allow-none): the child widget + * + * Sets the child widget of @window. + */ +void +gtk_window_set_child (GtkWindow *window, + GtkWidget *child) +{ + g_return_if_fail (GTK_IS_WINDOW (window)); + g_return_if_fail (child == NULL || GTK_IS_WIDGET (child)); + + gtk_window_add (GTK_CONTAINER (window), child); + g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_CHILD]); +} + +/** + * gtk_window_get_child: + * @window: a #GtkWindow + * + * Gets the child widget of @window. + * + * Returns: (nullable) (transfer none): the child widget of @window + */ +GtkWidget * +gtk_window_get_child (GtkWindow *window) +{ + g_return_val_if_fail (GTK_IS_WINDOW (window), NULL); + + return gtk_bin_get_child (GTK_BIN (window)); +} diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index 2563ac5cac..8333ac9160 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -240,6 +240,12 @@ void gtk_window_set_application (GtkWindow *window, GtkApplication *application); GDK_AVAILABLE_IN_ALL +void gtk_window_set_child (GtkWindow *window, + GtkWidget *child); +GDK_AVAILABLE_IN_ALL +GtkWidget *gtk_window_get_child (GtkWindow *window); + +GDK_AVAILABLE_IN_ALL void gtk_window_set_titlebar (GtkWindow *window, GtkWidget *titlebar); GDK_AVAILABLE_IN_ALL |