From fec7e6ddaac7ecc4299937ed39d2aaf13e954bf6 Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Fri, 22 May 2015 20:41:31 +0000 Subject: [PATCH] * ChangeLog: Correct version number in last commit. * Source/NSButtonCell.m (-encodeWithCoder:): Correct bug with image position in NSButtonFlags. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38526 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 8 +++++++- Source/NSButtonCell.m | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ea1206dc..978635c49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,16 @@ +2015-05-22 Fred Kiefer + + * ChangeLog: Correct version number in last commit. + * Source/NSButtonCell.m (-encodeWithCoder:): Correct bug with + image position in NSButtonFlags. + 2015-05-16 Richard Frith-Macdonald * Documentation/news.texi: * ANNOUNCE: * NEWS: * Version: - New 0.24.2 bugfix release + New 0.24.1 bugfix release 2015-05-13 Riccardo Mottola diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m index cd4a8526b..6ce86713a 100644 --- a/Source/NSButtonCell.m +++ b/Source/NSButtonCell.m @@ -1671,7 +1671,7 @@ typedef struct _GSButtonCellFlags || (_cell.image_position == NSImageOnly); buttonCellFlags.isHorizontal = (_cell.image_position == NSImageLeft) || (_cell.image_position == NSImageRight); - buttonCellFlags.isBottomOrLeft = (_cell.image_position == NSImageAbove) + buttonCellFlags.isBottomOrLeft = (_cell.image_position == NSImageLeft) || (_cell.image_position == NSImageBelow); buttonCellFlags.isImageAndText = (image != nil) && (_cell.image_position != NSImageOnly);