change code to handle a feature context returned by threads.

src/zmapWindow/zmapWindow.c

@@ -28,9 +28,9 @@
  *              
  * Exported functions: See ZMap/zmapWindow.h
  * HISTORY:
- * Last edited: Jun 22 09:57 2004 (edgrif)
+ * Last edited: Jun 25 14:28 2004 (edgrif)
  * Created: Thu Jul 24 14:36:27 2003 (edgrif)
- * CVS info:   $Id: zmapWindow.c,v 1.9 2004-06-22 12:25:48 edgrif Exp $
+ * CVS info:   $Id: zmapWindow.c,v 1.10 2004-06-25 13:42:26 edgrif Exp $
  *-------------------------------------------------------------------
  */
 
@@ -163,7 +163,7 @@ static void dataEventCB(GtkWidget *widget, GdkEventClient *event, gpointer cb_da
       zmapWindowData window_data = NULL ;
       ZMapWindow window = NULL ;
       gpointer data = NULL ;
-
+      ZMapFeatureContext feature_context ;
 
       /* Retrieve the data pointer from the event struct */
       memmove(&window_data, &(event->data.b[0]), sizeof(void *)) ;
@@ -173,16 +173,22 @@ static void dataEventCB(GtkWidget *widget, GdkEventClient *event, gpointer cb_da
       data = (gpointer)(window_data->data) ;
 
 
-      /* OK, can ignore data here and just call my dummied up GFF routine to deliver some
-       * features for Rob to draw..... */
-      {
-	GData *features ;
+      /* Can either get data from my dummied up GFF routine or if you set up an acedb server
+       * you can get data from there.... just undef the one you want... */
+
+#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
+      feature_context = testGetGFF() ;			    /* Data read from a file... */
+#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
+
+      feature_context = (ZMapFeatureContext)data ;	    /* Data from a server... */
+
+
+      /* ****Remember that someone needs to free the data passed over....****  */
+
 
+      /* <<<<<<<<<<<<<  ROB, this is where calls to your drawing code need to go  >>>>>>>>>>>> */
 
-	features = testGetGFF() ;
-      }      
 
-      /* Remember that someone needs to free the data passed over.... */
 
 
       g_free(window_data) ;				    /* Free the WindowData struct. */

src/zmapWindow/zmapWindow_P.h

@@ -26,9 +26,9 @@
  * Description: 
  * Exported functions: See XXXXXXXXXXXXX.h
  * HISTORY:
- * Last edited: Jun 22 09:57 2004 (edgrif)
+ * Last edited: Jun 25 12:11 2004 (edgrif)
  * Created: Fri Aug  1 16:45:58 2003 (edgrif)
- * CVS info:   $Id: zmapWindow_P.h,v 1.6 2004-06-22 12:25:49 edgrif Exp $
+ * CVS info:   $Id: zmapWindow_P.h,v 1.7 2004-06-25 13:42:26 edgrif Exp $
  *-------------------------------------------------------------------
  */
 #ifndef ZMAP_WINDOW_P_H
@@ -37,6 +37,11 @@
 #include <gtk/gtk.h>
 #include <ZMap/zmapWindow.h>
 
+
+/* Test scaffoling */
+#include <ZMap/zmapFeature.h>
+
+
 typedef struct _ZMapWindowStruct
 {
   gchar *sequence ;
@@ -75,7 +80,7 @@ GtkWidget *zmapWindowMakeFrame(ZMapWindow window) ;
 
 
 /* TEST SCAFFOLDING............... */
-GData *testGetGFF(void) ;
+ZMapFeatureContext testGetGFF(void) ;