gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-02-21 02:41:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed "if" statement

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@25132 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Dave Wetzel 2007-05-10 12:01:46 +00:00
parent 2b370da0c7
commit a187fb6a58
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2007-05-10 David Wetzel <dave@turbocat.de>
* GSWeb.framework/GSWPopUpButton.m
fixed "if" statement
2007-04-13 David Wetzel <dave@turbocat.de>
* Merged files from my branch to head. Changes include:
* Nearly all Dynamic Elements rewritten

16
GSWeb.framework/GSWPopUpButton.m
View file

@ -120,12 +120,14 @@ static SEL valueInComponentSEL = NULL;
[_associations removeObjectForKey:selectedValue__Key];
}
if ((_list == nil) || (_value != nil || _string != nil) && ((_item == nil) || (![_item isValueSettable])) ||
(_selection != nil) && (![_selection isValueSettable])) {
if (((_list == nil)) ||
((_value != nil) && ((_item == nil) && ([_item isValueSettable] == NO))) ||
(((_string != nil) || (_item != nil)) && (_item == nil)) ||
((_selection != nil) && ([_item isValueSettable] == NO))) {
[NSException raise:NSInvalidArgumentException
format:@"%s: 'list' must be present. 'item' must not be a constant if 'value' is present. Cannot have 'displayString' or 'value' without 'item'. 'selection' must not be a constant if present.",
__PRETTY_FUNCTION__];
[NSException raise:NSInvalidArgumentException
format:@"%s: 'list' must be present. 'item' must not be a constant if 'value' is present. Cannot have 'displayString' or 'value' without 'item'. 'selection' must not be a constant if present.",
__PRETTY_FUNCTION__];
}
if ((_selection != nil) && (_selectedValue != nil)) {
[NSException raise:NSInvalidArgumentException
@ -304,7 +306,8 @@ static SEL valueInComponentSEL = NULL;
}
}
if (_selection != nil) {
obj = [_selection valueInComponent:component];
// it seems like we have to do that below. dw.
// obj = [_selection valueInComponent:component];
} else {
if (_selectedValue != nil) {
compoValue = [_selectedValue valueInComponent:component];
@ -345,6 +348,7 @@ static SEL valueInComponentSEL = NULL;
}
GSWResponse_appendContentAsciiString(response,@"\n<option");
if (_selection != nil) {
obj = [_selection valueInComponent:component];
isSelected = (obj == nil) ? NO : [obj isEqual:arrayObj];
} else {
if (_selectedValue != nil) {