Fix for bug #158390. Thanks Stéphane Maniaci!

4 files changed, 81 insertions, 81 deletions

diff --git a/configure.in b/configure.in
index 0ecfe11..c694474 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl required versions of other tools.
 m4_define([req_ver_glib],	[1.3.11])
-m4_define([req_ver_gtk],	[2.12.0])
+m4_define([req_ver_gtk],	[2.14.0])
 m4_define([req_ver_libbonobo],	[1.107.0])
 m4_define([req_ver_libspi],	[0.12.1])
 m4_define([req_ver_orbit],	[2.3.100])
@@ -161,7 +161,7 @@ AC_SUBST(PYGTK_LIBS)
 
 dnl check for colorblind-applet required modules
 PKG_CHECK_MODULES(CBAPPLET,
-	gtk+-2.0		>= 2.6
+	gtk+-2.0		>= 2.14
 	pygtk-2.0		>= 2.6
 	pygobject-2.0		>= 2.6
 	gnome-python-2.0	>= 2.10
@@ -250,7 +250,7 @@ PKG_CHECK_MODULES(DEPS, [
 	libbonobo-2.0		>= 1.107.0
 	ORBit-2.0		>= 2.3.100
 	glib-2.0		>= 2.11.1
-	gtk+-2.0		>= 2.1.0
+	gtk+-2.0		>= 2.14.0
 	gdk-pixbuf-2.0		>= 2.1.0
 	dbus-glib-1
 ])
@@ -262,7 +262,7 @@ PKG_CHECK_MODULES(TEST, [
 	libbonobo-2.0		>= 1.107.0
 	ORBit-2.0		>= 2.3.100
 	glib-2.0		>= 1.3.11
-	gtk+-2.0		>= 2.1.0
+	gtk+-2.0		>= 2.14.0
 	gdk-pixbuf-2.0		>= 2.1.0
 ])
 AC_SUBST(TEST_LIBS)
diff --git a/magnifier/magnifier.c b/magnifier/magnifier.c
index ae93c64..ff6faed 100644
--- a/magnifier/magnifier.c
+++ b/magnifier/magnifier.c
@@ -144,7 +144,7 @@ mag_login_helper_get_raise_windows (LoginHelper *helper)
     if (magnifier && magnifier->priv && magnifier->priv->w)
     {
 	mainwin = g_new0 (Window, 2);
-	mainwin[0] = GDK_WINDOW_XWINDOW (magnifier->priv->w->window);
+	mainwin[0] = GDK_WINDOW_XWINDOW (gtk_widget_get_window (magnifier->priv->w));
 	mainwin[1] = None;
     }
     return mainwin;
@@ -282,7 +282,7 @@ magnifier_set_cursor_from_pixbuf (Magnifier *magnifier,
 	GdkPixmap *pixmap, *mask;
 	gint width, height;
 	GdkGC *gc;
-	GdkDrawable *drawable = magnifier->priv->w->window;
+	GdkDrawable *drawable = gtk_widget_get_window (magnifier->priv->w);
 
 	if (magnifier->priv->cursor) {
 		g_object_unref (magnifier->priv->cursor);
@@ -790,7 +790,7 @@ magnifier_transform_cursor (Magnifier *magnifier)
 		g_object_unref (cursor_pixmap);
 		g_object_unref (mask_pixmap);
 		magnifier->priv->cursor = gdk_pixmap_new (
-			magnifier->priv->w->window,
+			gtk_widget_get_window (magnifier->priv->w),
 			size_x, size_y,
 			-1);
 		if (!GDK_IS_DRAWABLE (magnifier->priv->cursor)) 
@@ -799,7 +799,7 @@ magnifier_transform_cursor (Magnifier *magnifier)
 		    return;
 		}
 		magnifier->priv->cursor_mask = gdk_pixmap_new (
-			magnifier->priv->w->window,
+		        gtk_widget_get_window (magnifier->priv->w),
 			size_x, size_y,
 			1);
 		if (GDK_IS_DRAWABLE (magnifier->priv->cursor)) {
diff --git a/magnifier/x11/gmag-graphical-server.c b/magnifier/x11/gmag-graphical-server.c
index c7e9039..a5c6c5f 100644
--- a/magnifier/x11/gmag-graphical-server.c
+++ b/magnifier/x11/gmag-graphical-server.c
@@ -160,11 +160,11 @@ gmag_gs_check_set_struts (Magnifier *magnifier)
 #if GTK_CHECK_VERSION (2,19,5)
 	if (magnifier &&
 	    magnifier->priv && magnifier->priv->w && gtk_widget_get_realized (magnifier->priv->w) &&
-	    magnifier->priv->w->window) 
+	    gtk_widget_get_window (magnifier->priv->w))
 #else
 	if (magnifier &&
 	    magnifier->priv && magnifier->priv->w && GTK_WIDGET_REALIZED (magnifier->priv->w) &&
-	    magnifier->priv->w->window) 
+	    gtk_widget_get_window (magnifier->priv->w))
 #endif
 	{
 		Atom atom_strut = gdk_x11_get_xatom_by_name ("_NET_WM_STRUT");
@@ -222,13 +222,13 @@ gmag_gs_check_set_struts (Magnifier *magnifier)
 		}
 		
 		gdk_error_trap_push ();
-		XChangeProperty (GDK_WINDOW_XDISPLAY (widget->window), 
-				 GDK_WINDOW_XWINDOW (widget->window), 
+		XChangeProperty (GDK_WINDOW_XDISPLAY (gtk_widget_get_window (widget)),
+				 GDK_WINDOW_XWINDOW (gtk_widget_get_window (widget)),
 				 atom_strut,
 				 XA_CARDINAL, 32, PropModeReplace,
 				 (guchar *) &struts, 4);
-		XChangeProperty (GDK_WINDOW_XDISPLAY (widget->window), 
-				 GDK_WINDOW_XWINDOW (widget->window), 
+		XChangeProperty (GDK_WINDOW_XDISPLAY (gtk_widget_get_window (widget)),
+				 GDK_WINDOW_XWINDOW (gtk_widget_get_window (widget)),
 				 atom_strut_partial,
 				 XA_CARDINAL, 32, PropModeReplace,
 				 (guchar *) &struts, 12); 
@@ -260,30 +260,30 @@ gmag_gs_reset_overlay_at_idle (gpointer data)
 		if (magnifier->priv && magnifier->priv->w &&
 		    GTK_WIDGET_REALIZED (magnifier->priv->w))
 #endif
-			if (magnifier->priv->w->window) {
+			if (gtk_widget_get_window (magnifier->priv->w)) {
 #ifdef HAVE_OVERLAY
 				gint      x, y, over_w, over_h;
 				if (!magnifier->priv->overlay) {
-					magnifier->priv->overlay = gdk_window_foreign_new (XCompositeGetOverlayWindow (GDK_WINDOW_XDISPLAY (magnifier->priv->w->window), GDK_WINDOW_XID (magnifier->priv->root)));
+					magnifier->priv->overlay = gdk_window_foreign_new (XCompositeGetOverlayWindow (GDK_WINDOW_XDISPLAY (gtk_widget_get_window (magnifier->priv->w)), GDK_WINDOW_XID (magnifier->priv->root)));
 					gdk_window_get_position (
-						magnifier->priv->w->window, &x,
+						gtk_widget_get_window (magnifier->priv->w), &x,
 						&y);
 					gdk_drawable_get_size (
-						magnifier->priv->w->window,
+						gtk_widget_get_window (magnifier->priv->w),
 						&over_w, &over_h);
 					gdk_window_move_resize (
 						magnifier->priv->overlay, x, y,
 						over_w, over_h);
 					gdk_window_reparent (
-						magnifier->priv->w->window,
+						gtk_widget_get_window (magnifier->priv->w),
 						magnifier->priv->overlay, 0, 0);
 				}
 #ifdef HAVE_SHAPEINPUT			
-				XShapeCombineRectangles (GDK_WINDOW_XDISPLAY (magnifier->priv->w->window), GDK_WINDOW_XID (magnifier->priv->overlay), ShapeInput, 0, 0, NULL, 0, ShapeSet, YXBanded);
+				XShapeCombineRectangles (GDK_WINDOW_XDISPLAY (gtk_widget_get_window (magnifier->priv->w)), GDK_WINDOW_XID (magnifier->priv->overlay), ShapeInput, 0, 0, NULL, 0, ShapeSet, YXBanded);
 #endif /* HAVE_SHAPEINPUT */
 #else
 #ifdef HAVE_SHAPEINPUT
-				XShapeCombineRectangles (GDK_WINDOW_XDISPLAY (magnifier->priv->w->window), GDK_WINDOW_XID (magnifier->priv->w->window), ShapeInput, 0, 0, NULL, 0, ShapeSet, YXBanded);
+				XShapeCombineRectangles (GDK_WINDOW_XDISPLAY (gtk_widget_get_window (magnifier->priv->w)), GDK_WINDOW_XID (gtk_widget_get_window (magnifier->priv->w)), ShapeInput, 0, 0, NULL, 0, ShapeSet, YXBanded);
 #endif /* HAVE_SHAPEINPUT */
 #endif /* HAVE_OVERLAY */
 				return FALSE;
@@ -323,7 +323,7 @@ gmag_gs_magnifier_realize (GtkWidget *widget)
 	Atom wm_window_protocols[2];
 	Atom wm_type_atoms[1];
 	Atom net_wm_window_type;
-	GdkDisplay *target_display = gdk_drawable_get_display (widget->window);
+	GdkDisplay *target_display = gdk_drawable_get_display (gtk_widget_get_window (widget));
 	
 	static gboolean initialized = FALSE;
 
@@ -341,18 +341,18 @@ gmag_gs_magnifier_realize (GtkWidget *widget)
 	wm_hints.flags = InputHint;
 	wm_hints.input = False;
 	
-	XSetWMHints (GDK_WINDOW_XDISPLAY (widget->window),
-		     GDK_WINDOW_XWINDOW (widget->window), &wm_hints);
+	XSetWMHints (GDK_WINDOW_XDISPLAY (gtk_widget_get_window (widget)),
+		     GDK_WINDOW_XWINDOW (gtk_widget_get_window (widget)), &wm_hints);
 	
-	XSetWMProtocols (GDK_WINDOW_XDISPLAY (widget->window),
-			 GDK_WINDOW_XWINDOW (widget->window), wm_window_protocols, 2);
+	XSetWMProtocols (GDK_WINDOW_XDISPLAY (gtk_widget_get_window (widget)),
+			 GDK_WINDOW_XWINDOW (gtk_widget_get_window (widget)), wm_window_protocols, 2);
 
 	net_wm_window_type = gdk_x11_get_xatom_by_name_for_display 
 		(target_display, "_NET_WM_WINDOW_TYPE");
 
 	if (net_wm_window_type && wm_type_atoms[0])
-		XChangeProperty (GDK_WINDOW_XDISPLAY (widget->window),
-				 GDK_WINDOW_XWINDOW (widget->window),
+		XChangeProperty (GDK_WINDOW_XDISPLAY (gtk_widget_get_window (widget)),
+				 GDK_WINDOW_XWINDOW (gtk_widget_get_window (widget)),
 				 net_wm_window_type,
 				 XA_ATOM, 32, PropModeReplace,
 				 (guchar *)wm_type_atoms,
@@ -384,8 +384,8 @@ gmag_gs_events_handler (GIOChannel *source, GIOCondition condition,
 	if (magnifier->priv->overlay)
 		mag_window = GDK_WINDOW_XID (magnifier->priv->overlay);
 #else
-	if (magnifier->priv->w && magnifier->priv->w->window)
-		mag_window = GDK_WINDOW_XID (magnifier->priv->w->window);
+	if (magnifier->priv->w && gtk_widget_get_window (magnifier->priv->w))
+		mag_window = GDK_WINDOW_XID (gtk_widget_get_window (magnifier->priv->w));
 #endif /* HAVE_OVERLAY */
 
 	do
diff --git a/magnifier/zoom-region.c b/magnifier/zoom-region.c
index c5055dd..66df717 100644
--- a/magnifier/zoom-region.c
+++ b/magnifier/zoom-region.c
@@ -620,8 +620,8 @@ zoom_region_clip_to_window (ZoomRegion *zoom_region,
 
 	return area;
 
-	if (zoom_region->priv->w->window)
-		gdk_drawable_get_size (GDK_DRAWABLE (zoom_region->priv->w->window),
+	if (gtk_widget_get_window (zoom_region->priv->w))
+		gdk_drawable_get_size (GDK_DRAWABLE (gtk_widget_get_window (zoom_region->priv->w)),
 				       &window_rect.x,
 				       &window_rect.y);
 	else 
@@ -838,13 +838,13 @@ zoom_region_paint_crosswire_cursor (ZoomRegion *zoom_region, GdkRectangle *clip_
 	g_assert (zoom_region->alive);
 #endif
 	if (!(magnifier &&
-	      zoom_region->priv->w->window &&
-	      GDK_IS_DRAWABLE (zoom_region->priv->w->window) &&
+	      gtk_widget_get_window (zoom_region->priv->w) &&
+	      GDK_IS_DRAWABLE (gtk_widget_get_window (zoom_region->priv->w)) &&
 	      magnifier->crosswire_size > 0)) return;
 
 	if (zoom_region->priv->crosswire_gc == NULL) 
 	{
-		zoom_region->priv->crosswire_gc = gdk_gc_new (zoom_region->priv->w->window);
+		zoom_region->priv->crosswire_gc = gdk_gc_new (gtk_widget_get_window (zoom_region->priv->w));
 		cmap = gdk_gc_get_colormap(zoom_region->priv->crosswire_gc);
 		last_color_init = FALSE;
 	}
@@ -934,32 +934,32 @@ zoom_region_paint_crosswire_cursor (ZoomRegion *zoom_region, GdkRectangle *clip_
 	}
 	if (magnifier->crosswire_size == 1) {
 		if (magnifier->crosswire_clip) {
-			gdk_draw_line (zoom_region->priv->w->window,
+			gdk_draw_line (gtk_widget_get_window (zoom_region->priv->w),
 				       zoom_region->priv->crosswire_gc,
 				       rect.x, y_top_clip, rect.x,
 				       y_bottom_clip);
-			gdk_draw_line (zoom_region->priv->w->window,
+			gdk_draw_line (gtk_widget_get_window (zoom_region->priv->w),
 				       zoom_region->priv->crosswire_gc,
 				       x_left_clip, rect.y, x_right_clip,
 				       rect.y);
 		}
-		gdk_draw_line (zoom_region->priv->w->window,
+		gdk_draw_line (gtk_widget_get_window (zoom_region->priv->w),
 			       zoom_region->priv->crosswire_gc,
 			       rect.x, y_start, rect.x, y_end);
-		gdk_draw_line (zoom_region->priv->w->window,
+		gdk_draw_line (gtk_widget_get_window (zoom_region->priv->w),
 			       zoom_region->priv->crosswire_gc,
 			       x_start, rect.y, x_end, rect.y);
 	}
 	else {
 		if (magnifier->crosswire_clip ) {
 			gdk_draw_rectangle (
-				zoom_region->priv->w->window,
+				gtk_widget_get_window (zoom_region->priv->w),
 				zoom_region->priv->crosswire_gc, TRUE,
 				rect.x - magnifier->crosswire_size / 2,
 				y_top_clip, magnifier->crosswire_size,
 				y_bottom_clip - y_top_clip);
 			gdk_draw_rectangle (
-				zoom_region->priv->w->window,
+				gtk_widget_get_window (zoom_region->priv->w),
 				zoom_region->priv->crosswire_gc, TRUE,
 				x_left_clip,
 				rect.y - magnifier->crosswire_size / 2,
@@ -967,12 +967,12 @@ zoom_region_paint_crosswire_cursor (ZoomRegion *zoom_region, GdkRectangle *clip_
 				magnifier->crosswire_size);
 		}
 		gdk_draw_rectangle (
-			zoom_region->priv->w->window,
+			gtk_widget_get_window (zoom_region->priv->w),
 			zoom_region->priv->crosswire_gc, TRUE,
 			rect.x - magnifier->crosswire_size / 2, y_start,
 			magnifier->crosswire_size, y_end - y_start);
 		gdk_draw_rectangle (
-			zoom_region->priv->w->window,
+			gtk_widget_get_window (zoom_region->priv->w),
 			zoom_region->priv->crosswire_gc, TRUE,
 			x_start, rect.y - magnifier->crosswire_size / 2,
 			x_end - x_start, magnifier->crosswire_size);
@@ -1034,18 +1034,18 @@ zoom_region_paint_cursor (ZoomRegion *zoom_region,
 				g_object_unref (zoom_region->priv->cursor_backing_pixels);
 			}
 			zoom_region->priv->cursor_backing_pixels =
-				gdk_pixmap_new (zoom_region->priv->w->window,
+				gdk_pixmap_new (gtk_widget_get_window (zoom_region->priv->w),
 						rect.width,
 						rect.height,
 						-1);
 		}
-		if (zoom_region->priv->w->window != NULL)
+		if (gtk_widget_get_window (zoom_region->priv->w) != NULL)
 		{
 			if (zoom_region->priv->default_gc == NULL) 
-				zoom_region->priv->default_gc = gdk_gc_new(zoom_region->priv->w->window);
+				zoom_region->priv->default_gc = gdk_gc_new(gtk_widget_get_window (zoom_region->priv->w));
 			gdk_draw_drawable (zoom_region->priv->cursor_backing_pixels,
 				     zoom_region->priv->default_gc,
-				     zoom_region->priv->w->window,
+				     gtk_widget_get_window (zoom_region->priv->w),
 				     rect.x,
 				     rect.y,
 				     0, 0,
@@ -1053,10 +1053,10 @@ zoom_region_paint_cursor (ZoomRegion *zoom_region,
 				     rect.height);
 		}
 		DEBUG_RECT ("painting", rect);
-		if (cursor && zoom_region->priv->w && GDK_IS_DRAWABLE (zoom_region->priv->w->window))
+		if (cursor && zoom_region->priv->w && GDK_IS_DRAWABLE (gtk_widget_get_window (zoom_region->priv->w)))
 		{
 		    if (zoom_region->priv->paint_cursor_gc == NULL)
-				zoom_region->priv->paint_cursor_gc = gdk_gc_new (zoom_region->priv->w->window);
+				zoom_region->priv->paint_cursor_gc = gdk_gc_new (gtk_widget_get_window (zoom_region->priv->w));
 
 			gdk_gc_set_clip_rectangle (zoom_region->priv->paint_cursor_gc, clip_rect);
 			values.clip_x_origin = rect.x;
@@ -1065,12 +1065,12 @@ zoom_region_paint_cursor (ZoomRegion *zoom_region,
 			gdk_gc_set_values(zoom_region->priv->paint_cursor_gc, &values, GDK_GC_CLIP_X_ORIGIN |
 					  GDK_GC_CLIP_Y_ORIGIN  | GDK_GC_CLIP_MASK);
 
-			gdk_draw_rectangle (zoom_region->priv->w->window,
+			gdk_draw_rectangle (gtk_widget_get_window (zoom_region->priv->w),
 					   zoom_region->priv->paint_cursor_gc,
 					   TRUE,
 					   rect.x, rect.y, rect.width, rect.height);
 
-			gdk_draw_drawable (zoom_region->priv->w->window,
+			gdk_draw_drawable (gtk_widget_get_window (zoom_region->priv->w),
 					   zoom_region->priv->paint_cursor_gc,
 					   cursor,
 					   0, 0,
@@ -1137,7 +1137,7 @@ zoom_region_paint_border (ZoomRegion *zoom_region)
 	     zoom_region->border_size_top > 0 ||
 	     zoom_region->border_size_right > 0 ||
 	     zoom_region->border_size_bottom > 0) &&
-	    (zoom_region->priv->border->window)) {
+	    (gtk_widget_get_window (zoom_region->priv->border))) {
 		color.red = (((zoom_region->border_color & 0xFF0000) >> 16) *
 			     65535) / 255;
 		color.green = (((zoom_region->border_color & 0xFF00) >> 8) *
@@ -1165,13 +1165,13 @@ zoom_region_paint_pixmap (ZoomRegion *zoom_region,
 	g_assert (zoom_region->priv);
 	g_assert (zoom_region->priv->w);
 
-        if (!GDK_IS_DRAWABLE (zoom_region->priv->w->window)) return;
+        if (!GDK_IS_DRAWABLE (gtk_widget_get_window (zoom_region->priv->w))) return;
 	if (zoom_region->priv->default_gc == NULL) 
-		zoom_region->priv->default_gc = gdk_gc_new (zoom_region->priv->w->window);
+		zoom_region->priv->default_gc = gdk_gc_new (gtk_widget_get_window (zoom_region->priv->w));
 
-	if (zoom_region->priv->pixmap && GDK_IS_DRAWABLE (zoom_region->priv->w->window))
+	if (zoom_region->priv->pixmap && GDK_IS_DRAWABLE (gtk_widget_get_window (zoom_region->priv->w)))
 	{
-		gdk_draw_drawable (zoom_region->priv->w->window,
+		gdk_draw_drawable (gtk_widget_get_window (zoom_region->priv->w),
 				   zoom_region->priv->default_gc,
 				   zoom_region->priv->pixmap,
 				   area->x + zoom_region->priv->exposed_bounds.x1 - zoom_region->priv->source_area.x1 * zoom_region->xscale,
@@ -1208,7 +1208,7 @@ zoom_region_create_pixmap (ZoomRegion *zoom_region)
 #ifdef ZOOM_REGION_DEBUG
 	g_assert (zoom_region->alive);
 #endif
-	if (zoom_region->priv->w && GDK_IS_DRAWABLE (zoom_region->priv->w->window))
+	if (zoom_region->priv->w && GDK_IS_DRAWABLE (gtk_widget_get_window (zoom_region->priv->w)))
 	{
 		long width = (zoom_region->priv->source_area.x2 -
 			      zoom_region->priv->source_area.x1) * zoom_region->xscale;
@@ -1216,11 +1216,11 @@ zoom_region_create_pixmap (ZoomRegion *zoom_region)
 			       zoom_region->priv->source_area.y1) * zoom_region->yscale;
 		zoom_region->priv->pixmap =
 			gdk_pixmap_new (
-				zoom_region->priv->w->window,
+				gtk_widget_get_window (zoom_region->priv->w),
 				width,
 				height,
 				gdk_drawable_get_depth (
-					zoom_region->priv->w->window));
+					gtk_widget_get_window (zoom_region->priv->w)));
 
 		if (gmag_gs_error_check ()) {
 			zoom_region->priv->pixmap = NULL;
@@ -1285,9 +1285,9 @@ zoom_region_update_cursor (ZoomRegion *zoom_region, int dx, int dy,
 	zoom_region_paint_cursor (zoom_region, clip_rect);
 	zoom_region_paint_crosswire_cursor (zoom_region, clip_rect);
 	if (GTK_IS_WIDGET (zoom_region->priv->w) &&
-	    GDK_IS_WINDOW (zoom_region->priv->w->window))
+	    GDK_IS_WINDOW (gtk_widget_get_window (zoom_region->priv->w)))
 		gdk_display_sync (gdk_drawable_get_display (
-					  zoom_region->priv->w->window));
+					  gtk_widget_get_window (zoom_region->priv->w)));
 }
 
 static gboolean
@@ -1307,8 +1307,8 @@ zoom_region_calculate_scroll_rects (ZoomRegion *zoom_region,
 	rect.x = 0;
 	rect.y = 0;
 	if (zoom_region && zoom_region->priv->w &&
-	    zoom_region->priv->w->window)
-		window = zoom_region->priv->w->window;
+	    gtk_widget_get_window (zoom_region->priv->w))
+		window = gtk_widget_get_window (zoom_region->priv->w);
 	else
 		retval = FALSE;
 	if (!window)
@@ -1355,8 +1355,8 @@ zoom_region_scroll_fast (ZoomRegion *zoom_region, int dx, int dy,
 #ifdef ZOOM_REGION_DEBUG
 	g_assert (zoom_region->alive);
 #endif
-	if (zoom_region->priv->w && zoom_region->priv->w->window)
-		window = zoom_region->priv->w->window;
+	if (zoom_region->priv->w && gtk_widget_get_window (zoom_region->priv->w))
+		window = gtk_widget_get_window (zoom_region->priv->w);
 	else {
 		processing_updates = FALSE;
 		return;
@@ -1385,8 +1385,8 @@ zoom_region_scroll_smooth (ZoomRegion *zoom_region, int dx, int dy,
 #ifdef ZOOM_REGION_DEBUG
 	g_assert (zoom_region->alive);
 #endif
-	if (zoom_region->priv->w && GDK_IS_DRAWABLE (zoom_region->priv->w->window))
-		window = zoom_region->priv->w->window;
+	if (zoom_region->priv->w && GDK_IS_DRAWABLE (gtk_widget_get_window (zoom_region->priv->w)))
+		window = gtk_widget_get_window (zoom_region->priv->w);
 	else
 		return;
 	window_rect.x = 0;
@@ -1773,10 +1773,10 @@ zoom_region_get_source_subwindow (ZoomRegion *zoom_region,
 				for (j = 0; j < height; ++j)
 					gdk_image_put_pixel (test_image, i, j, i*j);
 
-			zoom_region->priv->source_drawable = gdk_pixmap_new (zoom_region->priv->w->window, width, height, -1);
+			zoom_region->priv->source_drawable = gdk_pixmap_new (gtk_widget_get_window (zoom_region->priv->w), width, height, -1);
 
 			if (zoom_region->priv->default_gc == NULL)
-				zoom_region->priv->default_gc = gdk_gc_new(zoom_region->priv->w->window);
+				zoom_region->priv->default_gc = gdk_gc_new(gtk_widget_get_window (zoom_region->priv->w));
 
 			gdk_draw_image (zoom_region->priv->source_drawable,
 					zoom_region->priv->default_gc,
@@ -1891,7 +1891,7 @@ zoom_region_update_pixmap (ZoomRegion *zoom_region,
 		zoom_region_post_process_pixbuf (zoom_region, subimage,
 						 zoom_region->priv->scaled_pixbuf);
 		if (zoom_region->priv->default_gc == NULL)
-			zoom_region->priv->default_gc = gdk_gc_new(zoom_region->priv->w->window);
+			zoom_region->priv->default_gc = gdk_gc_new(gtk_widget_get_window (zoom_region->priv->w));
 
 #ifndef USE_GDK_PIXBUF_RENDER_TO_DRAWABLE 
 		if (GDK_IS_DRAWABLE (zoom_region->priv->pixmap))
@@ -1943,14 +1943,14 @@ zoom_region_update (ZoomRegion *zoom_region,
 		    const GdkRectangle update_rect)
 {
 	GdkRectangle paint_rect = {0, 0, 0, 0};
-	if (zoom_region->priv->w && zoom_region->priv->w->window) {
+	if (zoom_region->priv->w && gtk_widget_get_window (zoom_region->priv->w)) {
 		GdkRectangle source_rect = zoom_region_update_pixmap (zoom_region, update_rect, &paint_rect);
 		if (paint_rect.x != 0 || paint_rect.y != 0 ||
 		    paint_rect.width != 0 || paint_rect.height != 0) {
 			gdk_window_begin_paint_rect (
-				zoom_region->priv->w->window, &paint_rect);
+				gtk_widget_get_window (zoom_region->priv->w), &paint_rect);
 			zoom_region_paint (zoom_region, &paint_rect);
-			gdk_window_end_paint (zoom_region->priv->w->window);
+			gdk_window_end_paint (gtk_widget_get_window (zoom_region->priv->w));
 		}
 		if (timing_test) {
 			mag_timing.num_scale_samples++;
@@ -2089,13 +2089,13 @@ timing_report(ZoomRegion *zoom_region)
 		x_scroll_incr = (float)mag_timing.dx_total / (float)mag_timing.num_line_samples;
 		y_scroll_incr = (float)mag_timing.dy_total / (float)mag_timing.num_line_samples;
 
-		gdk_drawable_get_size (GDK_DRAWABLE (zoom_region->priv->w->window),
+		gdk_drawable_get_size (GDK_DRAWABLE (gtk_widget_get_window (zoom_region->priv->w)),
 			&x, &y);
 
 		fprintf(stderr, "  Frames Processed         = %ld\n", 
 			mag_timing.num_frame_samples + 1);
 		fprintf(stderr, "  Width/Height/Depth       = %d/%d/%d\n", x, y,
-			gdk_drawable_get_depth (zoom_region->priv->w->window));
+			gdk_drawable_get_depth (gtk_widget_get_window (zoom_region->priv->w)));
 		fprintf(stderr, "  Zoom Factor (x/y)        = %f/%f\n", zoom_region->xscale,
 			zoom_region->yscale);
 		if (mag_timing.num_scale_samples != 0) {
@@ -2284,7 +2284,7 @@ zoom_region_align (ZoomRegion *zoom_region)
 		if (zoom_region->timing_output) {
 			gint x, y;
 
-			gdk_drawable_get_size (GDK_DRAWABLE (zoom_region->priv->w->window),
+			gdk_drawable_get_size (GDK_DRAWABLE (gtk_widget_get_window (zoom_region->priv->w)),
 				&x, &y);
 
 			fprintf(stderr, "\nTiming Information - ROI   = (%d, %d) (%d, %d):\n",
@@ -2293,7 +2293,7 @@ zoom_region_align (ZoomRegion *zoom_region)
 			fprintf(stderr, "  Frame Number             = %ld\n", 
 				mag_timing.num_frame_samples + 1);
 			fprintf(stderr, "  Width/Height/Depth       = %d/%d/%d\n", x, y,
-				gdk_drawable_get_depth (zoom_region->priv->w->window));
+				gdk_drawable_get_depth (gtk_widget_get_window (zoom_region->priv->w)));
 		}
 
 		/*
@@ -3153,11 +3153,11 @@ impl_zoom_region_set_pointer_pos (PortableServer_Servant servant,
 	zoom_region_set_cursor_pos (zoom_region, (int) mouse_x, (int) mouse_y);
 
 	if (GTK_IS_WIDGET (zoom_region->priv->w) && 
-	    GDK_IS_DRAWABLE (zoom_region->priv->w->window))
+	    GDK_IS_DRAWABLE (gtk_widget_get_window (zoom_region->priv->w)))
 	{
 	    gdk_drawable_get_size (
 		GDK_DRAWABLE (
-		    zoom_region->priv->w->window),
+		    gtk_widget_get_window (zoom_region->priv->w)),
 		&paint_area.width, &paint_area.height);
 	    paint_area.x = 0;
 	    paint_area.y = 0;
@@ -3734,11 +3734,11 @@ impl_dbus_zoom_region_set_pointer_pos (ZoomRegion *zoom_region, gint32 mouse_x,
 	zoom_region_set_cursor_pos (zoom_region, (int) mouse_x, (int) mouse_y);
 
 	if (GTK_IS_WIDGET (zoom_region->priv->w) && 
-	    GDK_IS_DRAWABLE (zoom_region->priv->w->window))
+	    GDK_IS_DRAWABLE (gtk_widget_get_window (zoom_region->priv->w)))
 	{
 	    gdk_drawable_get_size (
 		GDK_DRAWABLE (
-		    zoom_region->priv->w->window),
+		    gtk_widget_get_window (zoom_region->priv->w)),
 		&paint_area.width, &paint_area.height);
 	    paint_area.x = 0;
 	    paint_area.y = 0;