Merge pull request #2810 from bedalton/fixed-cpscroller-return-style

Fixed: Change CPScroller's style method return type to int

AppKit/CPScroller.j

@@ -208,7 +208,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 /*!
     Returns the scroller's style
 */
-- (void)style
+- (int)style
 {
     return _style;
 }