Added Square and Ellipse to canvas drawing types

NOTE: tk/agg interface does not have Ellipse type