From e44ea6f45b85a80b7277cb3616aa522455ff5acc Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Thu, 15 Jul 2004 15:11:25 +0000
Subject: [PATCH] Add types to control struct.
---
src/zmapControl/zmapControl_P.h | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/zmapControl/zmapControl_P.h b/src/zmapControl/zmapControl_P.h
index 8cf257d87..55b10eed6 100755
--- a/src/zmapControl/zmapControl_P.h
+++ b/src/zmapControl/zmapControl_P.h
@@ -25,9 +25,9 @@
* Description: Private header for interface that creates/manages/destroys
* instances of ZMaps.
* HISTORY:
- * Last edited: Jul 13 18:57 2004 (edgrif)
+ * Last edited: Jul 15 15:52 2004 (edgrif)
* Created: Thu Jul 24 14:39:06 2003 (edgrif)
- * CVS info: $Id: zmapControl_P.h,v 1.5 2004-07-14 09:08:43 edgrif Exp $
+ * CVS info: $Id: zmapControl_P.h,v 1.6 2004-07-15 15:11:25 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_CONTROL_P_H
@@ -53,6 +53,7 @@ typedef enum {
+
/* A ZMap Control struct represents a single top level window which is a "ZMap", within
* this top level window there will be one or more zmap "Views". */
typedef struct _ZMapStruct
@@ -91,12 +92,13 @@ typedef struct _ZMapStruct
/* List of views in this zmap. */
+ GList *view_list ;
-#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
- ZMapView curr_view ;
-#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
- GList *view_list ;
+ /* In DAS2 terminology methods are types...easy to change if we don't like the name.
+ * These are the stylesheets in effect for the feature sets. */
+ GData *types ;
+
} ZMapStruct ;
@@ -118,13 +120,16 @@ typedef struct _ZMapPaneStruct
/* Functions internal to zmapControl. */
-gboolean zmapControlWindowCreate (ZMap zmap, char *zmap_id) ;
+gboolean zmapControlWindowCreate (ZMap zmap) ;
GtkWidget *zmapControlWindowMakeMenuBar(ZMap zmap) ;
GtkWidget *zmapControlWindowMakeButtons(ZMap zmap) ;
GtkWidget *zmapControlWindowMakeFrame (ZMap zmap) ;
-GtkWidget *zmapControlCreateNavigator(FooCanvas **canvas_out) ;
void zmapControlWindowDestroy (ZMap zmap) ;
+
+GtkWidget *zmapControlNavigatorCreate(FooCanvas **canvas_out) ;
+void zmapControlNavigatorNewView(ZMapMapBlock sequence_to_parent) ;
+
void zmapControlTopLevelKillCB(ZMap zmap) ;
void zmapControlLoadCB (ZMap zmap) ;
void zmapControlResetCB (ZMap zmap) ;
--
GitLab