finished merge of cairocanvas with windows and windows+cc branches