perf/gtkwidgetprofiler.c: Use accessor functions to access GtkWidget

[~andy/gtk] / perf / gtkwidgetprofiler.c

diff --git a/perf/gtkwidgetprofiler.c b/perf/gtkwidgetprofiler.c
index 937d8f538428faa2f67436eb68a734bca17acba4..c5b2cddbd633680e06267aa1ad3d52f2bfc97af7 100644 (file)
--- a/perf/gtkwidgetprofiler.c
+++ b/perf/gtkwidgetprofiler.c
@@ -168,7 +168,7 @@ create_widget_via_emission (GtkWidgetProfiler *profiler)
   if (!widget)
     g_error ("The profiler emitted the \"create-widget\" signal but the signal handler returned no widget!");
 
-  if (gtk_widget_get_visible (widget) || GTK_WIDGET_MAPPED (widget))
+  if (gtk_widget_get_visible (widget) || gtk_widget_get_mapped (widget))
     g_error ("The handler for \"create-widget\" must return an unmapped and unshown widget");
 
   return widget;
@@ -205,7 +205,7 @@ toplevel_idle_after_expose_cb (gpointer data)
   profiler = GTK_WIDGET_PROFILER (data);
   priv = profiler->priv;
 
-  gdk_property_change (priv->toplevel->window,
+  gdk_property_change (gtk_widget_get_window (priv->toplevel),
                       priv->profiler_atom,
                       gdk_atom_intern ("STRING", FALSE),
                       8,
@@ -390,6 +390,7 @@ static void
 profile_expose (GtkWidgetProfiler *profiler)
 {
   GtkWidgetProfilerPrivate *priv;
+  GtkAllocation allocation;
   GdkWindow *window;
   GdkWindowAttr attr;
   int attr_mask;
@@ -400,16 +401,19 @@ profile_expose (GtkWidgetProfiler *profiler)
 
   /* Time creation */
 
+  gtk_widget_get_allocation (priv->toplevel, &allocation);
+
   attr.x = 0;
   attr.y = 0;
-  attr.width = priv->toplevel->allocation.width;
-  attr.height = priv->toplevel->allocation.width;
+  attr.width = allocation.width;
+  attr.height = allocation.width;
   attr.wclass = GDK_INPUT_OUTPUT;
   attr.window_type = GDK_WINDOW_CHILD;
 
   attr_mask = GDK_WA_X | GDK_WA_Y;
 
-  window = gdk_window_new (priv->toplevel->window, &attr, attr_mask);
+  window = gdk_window_new (gtk_widget_get_window (priv->toplevel),
+                           &attr, attr_mask);
   gdk_window_set_back_pixmap (window, NULL, TRUE); /* avoid flicker */
 
   gdk_window_show (window);