vcl/osx/salframe.cxx | 5 +++++ 1 file changed, 5 insertions(+) New commits: commit b3ff24974507b98404f1c296926c7bf5777c3c97 Author: Douglas Mencken <dougmenc...@gmail.com> Date: Sat Oct 25 10:02:42 2014 -0400
restore conditional code for SetScrollBarSize related commit: ec147012340219c8bb5eaf8fe3d41be7836bc261 Change-Id: Ie8962f8d26f163eed91fdf6b137b0d9830183dd2 diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index f947566..5ede23b 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1250,7 +1250,12 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) getAppleScrollBarVariant(aStyleSettings); // set scrollbar size +#if MACOSX_SDK_VERSION >= 1070 aStyleSettings.SetScrollBarSize( static_cast<long int>([NSScroller scrollerWidthForControlSize:NSRegularControlSize scrollerStyle:NSScrollerStyleLegacy]) ); +#else + aStyleSettings.SetScrollBarSize( static_cast<long int>([NSScroller scrollerWidth]) ); +#endif + // images in menus false for MacOSX aStyleSettings.SetPreferredUseImagesInMenus( false ); aStyleSettings.SetHideDisabledMenuItems( true ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits