summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorhobbs2 <hobbs2>2005-08-10 16:53:38 (GMT)
committerhobbs2 <hobbs2>2005-08-10 16:53:38 (GMT)
commita05726c0a688474cb613e4fd0b8319f2b3d39a54 (patch)
tree87960fa929ac20fe182439dfaf62fefca0c9477a /generic
parent99911bfc5d1d86fe58eb2d6240be4e89a466dbad (diff)
downloadtktreectrl-a05726c0a688474cb613e4fd0b8319f2b3d39a54.zip
tktreectrl-a05726c0a688474cb613e4fd0b8319f2b3d39a54.tar.gz
tktreectrl-a05726c0a688474cb613e4fd0b8319f2b3d39a54.tar.bz2
* generic/tkTreeStyle.c (Style_DoLayout): use if instead of
tertiary ?: operator for funcs with different return types.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkTreeStyle.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/generic/tkTreeStyle.c b/generic/tkTreeStyle.c
index 2cbc32a..c685020 100644
--- a/generic/tkTreeStyle.c
+++ b/generic/tkTreeStyle.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 2002-2005 Tim Baker
*
- * RCS: @(#) $Id: tkTreeStyle.c,v 1.41 2005/07/23 00:38:11 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeStyle.c,v 1.42 2005/08/10 16:53:39 hobbs2 Exp $
*/
#include "tkTreeCtrl.h"
@@ -1449,9 +1449,11 @@ static void Style_DoLayout(StyleDrawArgs *drawArgs, struct Layout layouts[],
eLink2->layoutHeight = layout->useHeight;
}
- neededV ?
- Style_DoLayoutNeededV(drawArgs, layouts) :
- Style_DoLayoutV(drawArgs, layouts);
+ if (neededV) {
+ Style_DoLayoutNeededV(drawArgs, layouts);
+ } else {
+ Style_DoLayoutV(drawArgs, layouts);
+ }
}
/* Arrange Elements to determine the needed height and width of the Style */