Added rectangle progress bar

Also fixed #ifdef __cplusplus so will work again with Objective-C.

Demo now has ability to switch between circle and rectangle.