summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2014-06-27 22:03:11 -0400
committerMatthias Clasen <mclasen@redhat.com>2014-06-27 22:03:59 -0400
commit38e4fbc90ceca56cceb4ccf3d2d9e46a19ca8e4a (patch)
tree5c1f932e9c1014e831dea2f7252f892e6abe3305
parent96b6b44e4e0d5731d31375e59ce7312bf2f1e109 (diff)
downloadgtk+-38e4fbc90ceca56cceb4ccf3d2d9e46a19ca8e4a.tar.gz
Revert "colorplane: Don't connect to the configure-event signal"
This reverts commit 886f58e1cf2b4918ae33dc2b6279fd7e61c56827. This made the color plane go missing.
-rw-r--r--gtk/gtkcolorplane.c9
-rw-r--r--gtk/gtkdrawingarea.c2
2 files changed, 6 insertions, 5 deletions
diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c
index cd281c2152..4c1bbef185 100644
--- a/gtk/gtkcolorplane.c
+++ b/gtk/gtkcolorplane.c
@@ -172,11 +172,12 @@ create_surface (GtkColorPlane *plane)
g_free (data);
}
-static void
-plane_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
+static gboolean
+plane_configure (GtkWidget *widget,
+ GdkEventConfigure *event)
{
create_surface (GTK_COLOR_PLANE (widget));
+ return TRUE;
}
static void
@@ -492,7 +493,7 @@ gtk_color_plane_class_init (GtkColorPlaneClass *class)
object_class->set_property = plane_set_property;
widget_class->draw = plane_draw;
- widget_class->size_allocate = plane_size_allocate;
+ widget_class->configure_event = plane_configure;
widget_class->key_press_event = plane_key_press;
g_object_class_install_property (object_class,
diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index a9b659ee1c..4be0756ea9 100644
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -46,7 +46,7 @@
* when the widget is instantiated on a particular display.
* (Create GDK resources in response to this signal.)
*
- * - The #GtkWidget::size-allocate signal to take any necessary
+ * - The #GtkWidget::configure-event signal to take any necessary
* actions when the widget changes size.
*
* - The #GtkWidget::draw signal to handle redrawing the