From 708f65e03357eb1d76ffd2ac7a83909f650247a4 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Thu, 12 Feb 2009 16:15:17 +0000
Subject: [PATCH] styles for display now come from widnow struct.
---
src/zmapWindow/zmapWindowDrawFeatures.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/zmapWindow/zmapWindowDrawFeatures.c b/src/zmapWindow/zmapWindowDrawFeatures.c
index 353b8e92a..af604b2f9 100755
--- a/src/zmapWindow/zmapWindowDrawFeatures.c
+++ b/src/zmapWindow/zmapWindowDrawFeatures.c
@@ -26,9 +26,9 @@
*
* Exported functions:
* HISTORY:
- * Last edited: Feb 11 11:37 2009 (rds)
+ * Last edited: Feb 12 16:14 2009 (edgrif)
* Created: Thu Jul 29 10:45:00 2004 (rnc)
- * CVS info: $Id: zmapWindowDrawFeatures.c,v 1.228 2009-02-11 15:13:28 rds Exp $
+ * CVS info: $Id: zmapWindowDrawFeatures.c,v 1.229 2009-02-12 16:15:17 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -199,8 +199,7 @@ static gboolean window_draw_context_debug_G = FALSE;
*
* */
void zmapWindowDrawFeatures(ZMapWindow window,
- ZMapFeatureContext full_context, ZMapFeatureContext diff_context,
- GData *styles)
+ ZMapFeatureContext full_context, ZMapFeatureContext diff_context)
{
GtkAdjustment *h_adj;
ZMapCanvasDataStruct canvas_data = {NULL} ; /* Rest of struct gets set to zero. */
@@ -333,7 +332,7 @@ void zmapWindowDrawFeatures(ZMapWindow window,
*/
canvas_data.curr_x_offset = 0.0;
canvas_data.full_context = full_context ;
- canvas_data.styles = styles ;
+ canvas_data.styles = window->display_styles ;
zMapFeatureContextExecuteComplete((ZMapFeatureAny)full_context,
ZMAPFEATURE_STRUCT_FEATURE,
windowDrawContext,
@@ -366,11 +365,6 @@ void zmapWindowDrawFeatures(ZMapWindow window,
zmapWindowColumnConfigure(window, NULL, ZMAPWINDOWCOLUMN_CONFIGURE_ALL) ;
}
-
- /* Now throw away the styles list, should all be stored in the columns. */
- zMapStyleDestroyStyles(&styles) ;
-
-
if(debug_containers)
zmapWindowContainerPrint(root_group) ;
--
GitLab