Removed setStroke/getStroke methods and added a second parameter to the drawShape() method to provide the stroke there.  This is to avoid confusion about what stroke applies to  - as currently the other drawing primitives don't support stroke.