From 7fa7771df6cafaa1b2be3250b353b318c995deff Mon Sep 17 00:00:00 2001 From: Manuel Guesdon Date: Sun, 24 Apr 2005 11:56:46 +0000 Subject: [PATCH] Removed GSWHyperlink hrefInContext: and fixed enabled binding git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@21154 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ GSWeb.framework/GSWHyperlink.h | 2 -- GSWeb.framework/GSWHyperlink.m | 20 ++------------------ 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a82cf1..b1461da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-04-24 Manuel Guesdon + * GSWeb.framework/GSWHyperlink.m: + o removed -hrefInContext: + o fix for enabled binding + * GSWeb.framework/GSWHyperlink.h: + o removed -hrefInContext: + 2005-04-21 David Wetzel * GSWeb.framework: GSWApplication.m GSWDefaultAdaptor.m GSWDefaultAdaptorThread.m diff --git a/GSWeb.framework/GSWHyperlink.h b/GSWeb.framework/GSWHyperlink.h index c3135ce..b405a7d 100644 --- a/GSWeb.framework/GSWHyperlink.h +++ b/GSWeb.framework/GSWHyperlink.h @@ -92,8 +92,6 @@ inContext:(GSWContext*)aContext; -(void)_appendChildrenToResponse:(GSWResponse*)aResponse inContext:(GSWContext*)aContext; --(NSString*)hrefInContext:(GSWContext*)aContext; //NDFN - @end @interface GSWHyperlink (GSWHyperlinkB) diff --git a/GSWeb.framework/GSWHyperlink.m b/GSWeb.framework/GSWHyperlink.m index c3c7856..c7efe62 100644 --- a/GSWeb.framework/GSWHyperlink.m +++ b/GSWeb.framework/GSWHyperlink.m @@ -319,7 +319,7 @@ static Class standardClass = Nil; } else if (_enabled) { - disabledValue!=GSWDynamicElement_evaluateValueInContext(self,standardClass, + disabledValue=!GSWDynamicElement_evaluateValueInContext(self,standardClass, standardEvaluateConditionInContextIMP, _enabled,aContext); }; @@ -336,7 +336,7 @@ static Class standardClass = Nil; if (_href) { - NSString* hrefValue=[self hrefInContext:aContext]; + NSString* hrefValue=[_href valueInComponent:component]; GSWResponse_appendContentString(aResponse,hrefValue); if (!hrefValue) { @@ -718,22 +718,6 @@ static Class standardClass = Nil; LOGObjectFnStop(); } -//-------------------------------------------------------------------- -//NDFN --(NSString*)hrefInContext:(GSWContext*)aContext -{ - GSWComponent* component=nil; - NSString* hrefValue=nil; - - LOGObjectFnStart(); - - component=GSWContext_component(aContext); - hrefValue=[_href valueInComponent:component]; - - LOGObjectFnStop(); - - return hrefValue; -}; @end //====================================================================