diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-05-02 15:17:20 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-05-04 22:53:08 -0400 |
| commit | 9a65ed9adaa6e34d8322f8f6d642d88a9bd050e0 (patch) | |
| tree | 77661155d11857dbed0bcea0ecd93f8f0af9acd9 /gtk/gtkwindow.h | |
| parent | f59f3551902268600090c0382068103a09184df0 (diff) | |
| download | gtk+-9a65ed9adaa6e34d8322f8f6d642d88a9bd050e0.tar.gz | |
window: Derive from GtkWidget
We want to remove GtkBin and GtkContainer as they don't
provide much useful functionality anymore. This requires
us to move get_request_mode and compute_expand down.
Update the accessible implementation to match, remove
remnants of container implementations in GtkWindow
subclasses, and fix livecycle issues around destroy
vs dispose in GtkAssistant.
After this commit, using gtk_container_add on window
subclasses is not allowed anymore, but adding childing
with <child> in ui files still works.
See #2681
Diffstat (limited to 'gtk/gtkwindow.h')
| -rw-r--r-- | gtk/gtkwindow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index 8333ac9160..488a37c792 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -32,7 +32,7 @@ #include <gtk/gtkapplication.h> #include <gtk/gtkaccelgroup.h> -#include <gtk/gtkbin.h> +#include <gtk/gtkwidget.h> G_BEGIN_DECLS @@ -51,7 +51,7 @@ typedef struct _GtkWindowGroupPrivate GtkWindowGroupPrivate; struct _GtkWindow { - GtkBin parent_instance; + GtkWidget parent_instance; }; /** @@ -67,7 +67,7 @@ struct _GtkWindow */ struct _GtkWindowClass { - GtkBinClass parent_class; + GtkWidgetClass parent_class; /*< public >*/ |