[gtk/wip/chergert/fix-class-private-data-usage: 1/2] widget: move class private data to gtkwidgetprivate.h
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/chergert/fix-class-private-data-usage: 1/2] widget: move class private data to gtkwidgetprivate.h
- Date: Fri, 20 Mar 2020 17:53:10 +0000 (UTC)
commit da2356d3364c9c584541d3366fedf85c4e389680
Author: Christian Hergert <chergert redhat com>
Date: Fri Mar 20 09:16:30 2020 -0700
widget: move class private data to gtkwidgetprivate.h
We want access to the private data from the action muxer so we can just
move the structures to the gtkwidgetprivate.h header. Alternatively we
could create accessors, but given that we'll probably need to use this
in other areas, seems reasonable to just put it there.
gtk/gtkwidget.c | 16 ----------------
gtk/gtkwidgetprivate.h | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 634a50dbea..325cc69794 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -484,22 +484,6 @@ typedef struct {
GCallback callback_symbol;
} CallbackSymbol;
-typedef struct {
- GBytes *data;
- GSList *children;
- GtkBuilderScope *scope;
-} GtkWidgetTemplate;
-
-struct _GtkWidgetClassPrivate
-{
- GtkWidgetTemplate *template;
- GType accessible_type;
- AtkRole accessible_role;
- GQuark css_name;
- GType layout_manager_type;
- GPtrArray *actions;
-};
-
enum {
DESTROY,
SHOW,
diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 1018c9c915..ecac555813 100644
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -201,6 +201,23 @@ struct _GtkWidgetPrivate
GdkCursor *cursor;
};
+typedef struct
+{
+ GBytes *data;
+ GSList *children;
+ GtkBuilderScope *scope;
+} GtkWidgetTemplate;
+
+struct _GtkWidgetClassPrivate
+{
+ GtkWidgetTemplate *template;
+ GType accessible_type;
+ AtkRole accessible_role;
+ GQuark css_name;
+ GType layout_manager_type;
+ GtkWidgetAction *actions;
+};
+
void gtk_widget_root (GtkWidget *widget);
void gtk_widget_unroot (GtkWidget *widget);
GtkCssNode * gtk_widget_get_css_node (GtkWidget *widget);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]