From 26525cb1571a89869c2d2991b8fb68c31814ba47 Mon Sep 17 00:00:00 2001 From: gcasa Date: Fri, 14 Nov 2008 05:36:20 +0000 Subject: [PATCH] * Source/NSScrollView.m: Correct issue with tableviews when loading nib files, corrected bug #24782. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27044 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 +++++- Source/NSScrollView.m | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4571e907d..d43e16cad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-11-14 00:40-EST Gregory John Casamento + + * Source/NSScrollView.m: Correct issue with tableviews when + loading nib files, corrected bug #24782. + 2008-11-13 Fred Kiefer * Source/NSView.m (-setBounds:, -setBoundsSize:, -setFrame:, @@ -67,7 +72,6 @@ * Source/NSPopUpButton.m (-keyDown): Trigger action only after pressing the Space key. ->>>>>>> .r27016 2008-11-01 21:35-EDT Gregory John Casamento * Source/NSWindow.m: Reverted a previous change to miniaturize. diff --git a/Source/NSScrollView.m b/Source/NSScrollView.m index 1e9aff61b..54c8236c5 100644 --- a/Source/NSScrollView.m +++ b/Source/NSScrollView.m @@ -1519,7 +1519,9 @@ static float scrollerWidth; [content setFrame: frame]; } + // reset the content view... [self setContentView: content]; + _contentView = content; } if (hScroller != nil && _hasHorizScroller)