From ccecbc3b56d1ba380d62e194dfd2d30de8398d07 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Fri, 30 Apr 2010 10:11:27 +0000
Subject: [PATCH] correct missing casts.
---
src/zmapWindow/items/zmapWindowContainerUtils.c | 12 ++++--------
src/zmapWindow/zmapWindowFocus.c | 13 ++++++-------
src/zmapWindow/zmapWindowItem.c | 6 +++---
3 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/zmapWindow/items/zmapWindowContainerUtils.c b/src/zmapWindow/items/zmapWindowContainerUtils.c
index b59df312b..587a5a2bf 100755
--- a/src/zmapWindow/items/zmapWindowContainerUtils.c
+++ b/src/zmapWindow/items/zmapWindowContainerUtils.c
@@ -28,9 +28,9 @@
*
* Exported functions: See zmapWindowContainerUtils.h
* HISTORY:
- * Last edited: Apr 30 10:23 2010 (edgrif)
+ * Last edited: Apr 30 11:04 2010 (edgrif)
* Created: Tue Apr 28 16:10:46 2009 (rds)
- * CVS info: $Id: zmapWindowContainerUtils.c,v 1.15 2010-04-30 09:24:40 edgrif Exp $
+ * CVS info: $Id: zmapWindowContainerUtils.c,v 1.16 2010-04-30 10:12:17 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -470,7 +470,7 @@ gboolean zmapWindowContainerSetItemPosition(ZMapWindowContainerGroup container_p
result = TRUE ;
}
- return ;
+ return result ;
}
@@ -518,9 +518,6 @@ FooCanvasItem *zmapWindowContainerGetNextFeatureItem(FooCanvasItem *orig_item,
FooCanvasItem *item = NULL ;
ZMapWindowContainerGroup container_group;
ZMapWindowContainerFeatures container_features;
- FooCanvasGroup *features ;
- GList *feature_ptr ;
- FooCanvasItem *found_item = NULL ;
FooCanvasGroup *group ;
/* If it's a collection feature just return the collection feature, temporary. */
@@ -542,7 +539,7 @@ FooCanvasItem *zmapWindowContainerGetNextFeatureItem(FooCanvasItem *orig_item,
/* It's a child of a collection feature so get the collection feature
* this is temporary, I'm going to remove collection features...currently
* they set between features and feature sets */
- container_features = FOO_CANVAS_GROUP(orig_item->parent) ;
+ container_features = ZMAP_CONTAINER_FEATURES(orig_item->parent) ;
}
else
{
@@ -570,7 +567,6 @@ static FooCanvasItem *getNextFeatureItem(FooCanvasGroup *group,
gpointer user_data)
{
FooCanvasItem *item = NULL ;
- ZMapWindowContainerFeatures container_features;
FooCanvasGroup *features ;
GList *feature_ptr ;
FooCanvasItem *found_item = NULL ;
diff --git a/src/zmapWindow/zmapWindowFocus.c b/src/zmapWindow/zmapWindowFocus.c
index ab6812b6e..2203c2f19 100755
--- a/src/zmapWindow/zmapWindowFocus.c
+++ b/src/zmapWindow/zmapWindowFocus.c
@@ -27,9 +27,9 @@
*
* Exported functions: See zmapWindow_P.h
* HISTORY:
- * Last edited: Apr 30 10:13 2010 (edgrif)
+ * Last edited: Apr 30 11:00 2010 (edgrif)
* Created: Tue Jan 16 09:46:23 2007 (rds)
- * CVS info: $Id: zmapWindowFocus.c,v 1.17 2010-04-30 09:14:40 edgrif Exp $
+ * CVS info: $Id: zmapWindowFocus.c,v 1.18 2010-04-30 10:11:27 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -184,7 +184,6 @@ void zmapWindowFocusSetHotItem(ZMapWindowFocus focus, FooCanvasItem *item, gbool
}
}
-
item_area = ensure_unique(focus, item);
/* Stick the item on the front. */
@@ -196,7 +195,7 @@ void zmapWindowFocusSetHotItem(ZMapWindowFocus focus, FooCanvasItem *item, gbool
setFocusColumn(focus, column) ; /* N.B. May sort features. */
/* Record where the item is in the stack of column items _after_ setFocusColumn. */
- focus->hot_item_orig_index = zmapWindowContainerGetItemPosition(column, item) ;
+ focus->hot_item_orig_index = zmapWindowContainerGetItemPosition(ZMAP_CONTAINER_GROUP(column), item) ;
/* Now raise the item to the top of its group to make sure it is visible. */
zmapWindowRaiseItem(item) ;
@@ -308,13 +307,13 @@ void zmapWindowFocusRemoveFocusItem(ZMapWindowFocus focus, FooCanvasItem *item)
/* Try to put it back in its original position, note if this function is called during destroy
* the features list may already have gone so we cannot put it back.... */
- container_parent = zmapWindowContainerCanvasItemGetContainer(item) ;
+ container_parent = FOO_CANVAS_GROUP(zmapWindowContainerCanvasItemGetContainer(item)) ;
- if ((curr_index = zmapWindowContainerGetItemPosition(container_parent, item)) != -1)
+ if ((curr_index = zmapWindowContainerGetItemPosition(ZMAP_CONTAINER_GROUP(container_parent), item)) != -1)
{
position = curr_index - focus->hot_item_orig_index ;
- if ((zmapWindowContainerSetItemPosition(container_parent,
+ if ((zmapWindowContainerSetItemPosition(ZMAP_CONTAINER_GROUP(container_parent),
item, focus->hot_item_orig_index)) == -1)
zMapLogWarning("%s", "zmapWindowContainerSetItemPosition() could not find item in container_parent.") ;
diff --git a/src/zmapWindow/zmapWindowItem.c b/src/zmapWindow/zmapWindowItem.c
index 8c3651f15..e03e2395e 100755
--- a/src/zmapWindow/zmapWindowItem.c
+++ b/src/zmapWindow/zmapWindowItem.c
@@ -26,9 +26,9 @@
*
* Exported functions: See zmapWindow_P.h
* HISTORY:
- * Last edited: Apr 23 15:20 2010 (edgrif)
+ * Last edited: Apr 30 11:01 2010 (edgrif)
* Created: Thu Sep 8 10:37:24 2005 (edgrif)
- * CVS info: $Id: zmapWindowItem.c,v 1.130 2010-04-23 14:37:53 edgrif Exp $
+ * CVS info: $Id: zmapWindowItem.c,v 1.131 2010-04-30 10:11:44 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -191,7 +191,7 @@ ZMapFeatureAny zmapWindowItemGetFeatureAnyType(FooCanvasItem *item, ZMapFeatureS
}
else if ((feature_item = zMapWindowCanvasItemIntervalGetObject(item)))
{
- feature_any = (ZMapFeatureAny)zMapWindowCanvasItemGetFeature(feature_item);
+ feature_any = (ZMapFeatureAny)zMapWindowCanvasItemGetFeature(FOO_CANVAS_ITEM(feature_item)) ;
}
else
{
--
GitLab