Index: trunk/src/draw_ly_spec.c
===================================================================
--- trunk/src/draw_ly_spec.c	(revision 37886)
+++ trunk/src/draw_ly_spec.c	(revision 37887)
@@ -332,7 +332,7 @@
 {
 	rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
 	rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
-	rnd_r_search(PCB->Data->rat_tree, drawn_area, NULL, pcb_rat_draw_callback, info, NULL);
+	rnd_rtree_search_any(PCB->Data->rat_tree, (rnd_rtree_box_t *)drawn_area, NULL, pcb_rat_draw_callback, info, NULL);
 	rnd_render->set_drawing_mode(rnd_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
 }
 
Index: trunk/src/obj_rat.c
===================================================================
--- trunk/src/obj_rat.c	(revision 37886)
+++ trunk/src/obj_rat.c	(revision 37887)
@@ -416,9 +416,9 @@
 }
 
 /*** draw ***/
-rnd_r_dir_t pcb_rat_draw_callback(const rnd_box_t * b, void *cl)
+rnd_rtree_dir_t pcb_rat_draw_callback(void *cl, void *obj, const rnd_rtree_box_t *box)
 {
-	pcb_rat_t *rat = (pcb_rat_t *) b;
+	pcb_rat_t *rat = (pcb_rat_t *)obj;
 	pcb_draw_info_t *info = cl;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_SELECTED | PCB_FLAG_FOUND, rat)) {
@@ -447,7 +447,7 @@
 	}
 	else
 		pcb_line_draw_(info, (pcb_line_t *) rat, 0);
-	return RND_R_DIR_FOUND_CONTINUE;
+	return rnd_RTREE_DIR_FOUND_CONT;
 }
 
 void pcb_rat_invalidate_erase(pcb_rat_t *Rat)
Index: trunk/src/obj_rat_draw.h
===================================================================
--- trunk/src/obj_rat_draw.h	(revision 37886)
+++ trunk/src/obj_rat_draw.h	(revision 37887)
@@ -30,7 +30,7 @@
 
 /* Include rtree.h for these */
 #ifdef RND_RTREE_H
-rnd_r_dir_t pcb_rat_draw_callback(const rnd_box_t * b, void *cl);
+rnd_rtree_dir_t pcb_rat_draw_callback(void *cl, void *obj, const rnd_rtree_box_t *box);
 #endif
 
 void pcb_rat_invalidate_erase(pcb_rat_t *Rat);