diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2013-01-23 11:13:01 -0500 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2013-01-26 02:18:39 -0500 |
| commit | 9c1c3b49f5dfff7a7e2fc97ac273591d06ccb99c (patch) | |
| tree | 59f439bd03748909f173e94828f3fd5b647a0293 | |
| parent | dd833806ef7418678cbaea53ad65b062a5d47d18 (diff) | |
| download | clutter-gtk-9c1c3b49f5dfff7a7e2fc97ac273591d06ccb99c.tar.gz | |
embed: remove workaround for broken state propagation
This shouldn't be needed anymore with recent GTK versions. As a side
effect, bump the required GTK version to 3.6.
This reverts commit bf3397b588e0209486945e4bd71d28c5dc2e1497
https://bugzilla.gnome.org/show_bug.cgi?id=692399
| -rw-r--r-- | clutter-gtk/gtk-clutter-embed.c | 13 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/clutter-gtk/gtk-clutter-embed.c b/clutter-gtk/gtk-clutter-embed.c index 6cdc110..f2c9c73 100644 --- a/clutter-gtk/gtk-clutter-embed.c +++ b/clutter-gtk/gtk-clutter-embed.c @@ -827,18 +827,6 @@ gtk_clutter_embed_event (GtkWidget *widget, } static void -gtk_clutter_embed_state_flags_changed (GtkWidget *widget, - GtkStateFlags prev_state_flags) -{ - if (GTK_WIDGET_CLASS (gtk_clutter_embed_parent_class)->state_flags_changed != NULL) - GTK_WIDGET_CLASS (gtk_clutter_embed_parent_class)->state_flags_changed (widget, prev_state_flags); - - gtk_container_forall (GTK_CONTAINER (widget), - (GtkCallback) gtk_widget_queue_draw, - NULL); -} - -static void gtk_clutter_embed_set_property (GObject *gobject, guint prop_id, const GValue *value, @@ -906,7 +894,6 @@ gtk_clutter_embed_class_init (GtkClutterEmbedClass *klass) widget_class->key_press_event = gtk_clutter_embed_key_event; widget_class->key_release_event = gtk_clutter_embed_key_event; widget_class->event = gtk_clutter_embed_event; - widget_class->state_flags_changed = gtk_clutter_embed_state_flags_changed; widget_class->get_request_mode = gtk_clutter_embed_get_request_mode; widget_class->get_preferred_width = gtk_clutter_embed_get_preferred_width; widget_class->get_preferred_height = gtk_clutter_embed_get_preferred_height; diff --git a/configure.ac b/configure.ac index afccbdd..2090127 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ AC_CHECK_LIBM AC_SUBST(LIBM) m4_define([clutter_req_version], [1.9.16]) -m4_define([gtk_req_version], [3.2.0]) +m4_define([gtk_req_version], [3.6.0]) PKG_CHECK_MODULES([CLUTTER_GTK_DEPS], [clutter-1.0 >= clutter_req_version gtk+-3.0 >= gtk_req_version]) AC_SUBST([CLUTTER_GTK_DEPS_CFLAGS]) |