Added MyCanvas and MyCanvas_Polygon
Cherry picked commits from Marius

Cherry picking commits from Marius:
ed1460c134f7fcf5f5fb04016515255325c6c8b9
Merge branch 'marius'