treeview: fix a critical warning

[~andy/gtk] / gtk / gtkeventbox.c

diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c
index d2d8c6d39d7df8d83d219a4c0361bf8c0a7ebdf5..98025be07e55487ad2672e426f630a543d49eb89 100644 (file)
--- a/gtk/gtkeventbox.c
+++ b/gtk/gtkeventbox.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -431,7 +429,7 @@ gtk_event_box_realize (GtkWidget *widget)
       window = gdk_window_new (gtk_widget_get_parent_window (widget),
                                &attributes, attributes_mask);
       gtk_widget_set_window (widget, window);
-      gdk_window_set_user_data (window, widget);
+      gtk_widget_register_window (widget, window);
     }
   else
     {
@@ -450,7 +448,7 @@ gtk_event_box_realize (GtkWidget *widget)
 
       priv->event_window = gdk_window_new (window,
                                            &attributes, attributes_mask);
-      gdk_window_set_user_data (priv->event_window, widget);
+      gtk_widget_register_window (widget, priv->event_window);
     }
 
   if (visible_window)
@@ -464,7 +462,7 @@ gtk_event_box_unrealize (GtkWidget *widget)
 
   if (priv->event_window != NULL)
     {
-      gdk_window_set_user_data (priv->event_window, NULL);
+      gtk_widget_unregister_window (widget, priv->event_window);
       gdk_window_destroy (priv->event_window);
       priv->event_window = NULL;
     }
@@ -596,12 +594,9 @@ gtk_event_box_draw (GtkWidget *widget,
 
       context = gtk_widget_get_style_context (widget);
 
-      gtk_style_context_save (context);
-      gtk_style_context_set_state (context, gtk_widget_get_state_flags (widget));
       gtk_render_background (context, cr, 0, 0,
                              gtk_widget_get_allocated_width (widget),
                              gtk_widget_get_allocated_height (widget));
-      gtk_style_context_restore (context);
     }
 
   GTK_WIDGET_CLASS (gtk_event_box_parent_class)->draw (widget, cr);