Progress towards reinstating all of the gtk / cairo function from gtk-toy-diagrams