Replace some instances of GdkDrawable with GdkWindow