[writeSelectionToPasteboard:types:] corrected C binary operator

short cut logic	that prevented us froam adding more than one
string type to the pasteboard. Remember that || wont evaluate the
second operand if the first is true.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11885 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2001-12-23 02:15:40 +00:00
parent ce22ed5135
commit 7f8dba0b2f

View file

@ -3477,20 +3477,20 @@ other than copy/paste or dragging. */
{ {
if ([type isEqualToString: NSStringPboardType]) if ([type isEqualToString: NSStringPboardType])
{ {
ret = ret || [pboard setString: [[self string] substringWithRange: _selected_range] ret = [pboard setString: [[self string] substringWithRange: _selected_range]
forType: NSStringPboardType]; forType: NSStringPboardType] || ret;
} }
if ([type isEqualToString: NSRTFPboardType]) if ([type isEqualToString: NSRTFPboardType])
{ {
ret = ret || [pboard setData: [self RTFFromRange: _selected_range] ret = [pboard setData: [self RTFFromRange: _selected_range]
forType: NSRTFPboardType]; forType: NSRTFPboardType] || ret;
} }
if ([type isEqualToString: NSRTFDPboardType]) if ([type isEqualToString: NSRTFDPboardType])
{ {
ret = ret || [pboard setData: [self RTFDFromRange: _selected_range] ret = [pboard setData: [self RTFDFromRange: _selected_range]
forType: NSRTFDPboardType]; forType: NSRTFDPboardType] || ret;
} }
if ([type isEqualToString: NSColorPboardType]) if ([type isEqualToString: NSColorPboardType])