AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 22:30:22 +00:00
Code Issues Projects Releases Wiki Activity

window: Add a child property

Browse Source
This commit is contained in:
Matthias Clasen 2020-05-02 11:33:10 -04:00
parent 4aa5fba0b5
commit b9b1bf85e1
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gtk/gtk4-sections.txt
View File

@ -4203,6 +4203,8 @@ gtk_requisition_get_type
GtkWindow GtkWindow
GtkWindowClass GtkWindowClass
gtk_window_new gtk_window_new
gtk_window_get_child
gtk_window_set_child
gtk_window_set_title gtk_window_set_title
gtk_window_set_resizable gtk_window_set_resizable
gtk_window_get_resizable gtk_window_get_resizable

49
gtk/gtkwindow.c
View File

@ -293,6 +293,7 @@ enum {
PROP_APPLICATION, PROP_APPLICATION,
PROP_DEFAULT_WIDGET, PROP_DEFAULT_WIDGET,
PROP_FOCUS_WIDGET, PROP_FOCUS_WIDGET,
PROP_CHILD,
/* Readonly properties */ /* Readonly properties */
PROP_IS_ACTIVE, PROP_IS_ACTIVE,
@ -961,6 +962,14 @@ gtk_window_class_init (GtkWindowClass *klass)
GTK_TYPE_WIDGET, GTK_TYPE_WIDGET,
GTK_PARAM_READWRITE|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY); 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); 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: case PROP_FOCUS_WIDGET:
gtk_window_set_focus (window, g_value_get_object (value)); gtk_window_set_focus (window, g_value_get_object (value));
break; break;
case PROP_CHILD:
gtk_window_set_child (window, g_value_get_object (value));
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -2020,6 +2032,9 @@ gtk_window_get_property (GObject *object,
case PROP_FOCUS_WIDGET: case PROP_FOCUS_WIDGET:
g_value_set_object (value, gtk_window_get_focus (window)); g_value_set_object (value, gtk_window_get_focus (window));
break; break;
case PROP_CHILD:
g_value_set_object (value, gtk_window_get_child (window));
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -8070,3 +8085,37 @@ gtk_window_maybe_update_cursor (GtkWindow *window,
break; 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));
}

6
gtk/gtkwindow.h
View File

@ -239,6 +239,12 @@ GDK_AVAILABLE_IN_ALL
void gtk_window_set_application (GtkWindow *window, void gtk_window_set_application (GtkWindow *window,
GtkApplication *application); 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 GDK_AVAILABLE_IN_ALL
void gtk_window_set_titlebar (GtkWindow *window, void gtk_window_set_titlebar (GtkWindow *window,
GtkWidget *titlebar); GtkWidget *titlebar);