gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 02:04:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSCell.m (_updateFieldEditor:): Fix what I presume is

Browse source 
a typo. The "if (nil == _contents) { contents = @""; }" blocks were
dead code because the contents variable would later
be set to nil if _contents was nil. This was causing an exception
when starting editing an empty text field loaded from a xib.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@35011 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2012-03-27 19:26:17 +00:00
parent a900e2f5cb
commit c500d8379f
2 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2012-03-27 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSCell.m (_updateFieldEditor:): Fix what I presume is
a typo. The "if (nil == _contents) { contents = @""; }" blocks were
dead code because the contents variable would later
be set to nil if _contents was nil. This was causing an exception
when starting editing an empty text field loaded from a xib.
2012-03-26 Eric Wasylishen <ewasylishen@gmail.com>
* Headers/AppKit/NSSplitView.h:

38
Source/NSCell.m
View file

@ -2997,15 +2997,17 @@ static NSColor *dtxtCol;
{
contents = @"";
}
if (_cell.contents_is_attributed_string == NO)
{
contents = (NSString *)_contents;
}
else
{
contents = [(NSAttributedString *)_contents string];
}
else
{
if (_cell.contents_is_attributed_string == NO)
{
contents = (NSString *)_contents;
}
else
{
contents = [(NSAttributedString *)_contents string];
}
}
}
if (![contents isEqualToString: [textObject string]])
[textObject setText: contents];
@ -3018,15 +3020,17 @@ static NSColor *dtxtCol;
{
contents = @"";
}
if (_cell.contents_is_attributed_string == NO)
{
contents = (NSString *)_contents;
}
else
{
contents = [(NSAttributedString *)_contents string];
}
{
if (_cell.contents_is_attributed_string == NO)
{
contents = (NSString *)_contents;
}
else
{
contents = [(NSAttributedString *)_contents string];
}
}
if (![contents isEqualToString: [textObject string]])
{
if (_cell.contents_is_attributed_string == NO)