summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk/gtkdrawingarea.c2
-rw-r--r--gtk/gtkdrawingarea.h2
-rw-r--r--gtk/gtkwidget.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index 1a59bfc6d3..8fdb23b0f7 100644
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -64,6 +64,8 @@ static void
gtk_drawing_area_init (GtkDrawingArea *darea)
{
GTK_WIDGET_SET_FLAGS (darea, GTK_BASIC);
+
+ darea->draw_data = NULL;
}
diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index d11445b030..9e5431878a 100644
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@@ -39,6 +39,8 @@ typedef struct _GtkDrawingAreaClass GtkDrawingAreaClass;
struct _GtkDrawingArea
{
GtkWidget widget;
+
+ gpointer draw_data;
};
struct _GtkDrawingAreaClass
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 1a0e4660c8..e9e76a69af 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2406,7 +2406,7 @@ gtk_widget_set_rc_style (GtkWidget *widget)
{
g_assert (initial_emission == TRUE); /* FIXME: remove this line */
- gtk_widget_set_style_internal (widget, new_style, TRUE);
+ gtk_widget_set_style_internal (widget, widget->style, TRUE);
}
}
}