Changed ShapesDemo disposing messages