change button_click callback to focus callback which is what it really is.

src/include/ZMap/zmapView.h

@@ -29,9 +29,9 @@
  *              servers.
  *              
  * HISTORY:
- * Last edited: Jul 15 15:15 2004 (edgrif)
+ * Last edited: Jul 16 12:54 2004 (edgrif)
  * Created: Thu May 13 14:59:14 2004 (edgrif)
- * CVS info:   $Id: zmapView.h,v 1.5 2004-07-15 15:04:08 edgrif Exp $
+ * CVS info:   $Id: zmapView.h,v 1.6 2004-07-16 12:01:06 edgrif Exp $
  *-------------------------------------------------------------------
  */
 #ifndef ZMAPVIEW_H
@@ -62,7 +62,7 @@ typedef void (*ZMapViewCallbackFunc)(ZMapView zmap_view, void *app_data) ;
 typedef struct _ZMapViewCallbacksStruct
 {
   ZMapViewCallbackFunc load_data ;
-  ZMapViewWindowCallbackFunc button_click ;
+  ZMapViewWindowCallbackFunc focus ;
   ZMapViewCallbackFunc destroy ;
 } ZMapViewCallbacksStruct, *ZMapViewCallbacks ;
 

src/include/ZMap/zmapWindow.h

@@ -27,9 +27,9 @@
  *              window displaying genome data.
  *              
  * HISTORY:
- * Last edited: Jul 15 10:26 2004 (rnc)
+ * Last edited: Jul 16 12:55 2004 (edgrif)
  * Created: Thu Jul 24 15:21:56 2003 (edgrif)
- * CVS info:   $Id: zmapWindow.h,v 1.10 2004-07-15 16:27:58 rnc Exp $
+ * CVS info:   $Id: zmapWindow.h,v 1.11 2004-07-16 12:01:07 edgrif Exp $
  *-------------------------------------------------------------------
  */
 #ifndef ZMAP_WINDOW_H
@@ -57,7 +57,7 @@ typedef void (*ZMapWindowCallbackFunc)(ZMapWindow window, void *caller_data) ;
 typedef struct _ZMapWindowCallbacksStruct
 {
   ZMapWindowCallbackFunc scroll ;
-  ZMapWindowCallbackFunc button_click ;
+  ZMapWindowCallbackFunc focus ;
   ZMapWindowCallbackFunc destroy ;
 
 } ZMapWindowCallbacksStruct, *ZMapWindowCallbacks ;

src/zmapControl/zmapControl.c

@@ -26,9 +26,9 @@
  *              the window code and the threaded server code.
  * Exported functions: See ZMap.h
  * HISTORY:
- * Last edited: Jul 16 09:24 2004 (edgrif)
+ * Last edited: Jul 16 12:57 2004 (edgrif)
  * Created: Thu Jul 24 16:06:44 2003 (edgrif)
- * CVS info:   $Id: zmapControl.c,v 1.18 2004-07-16 08:46:15 edgrif Exp $
+ * CVS info:   $Id: zmapControl.c,v 1.19 2004-07-16 12:01:08 edgrif Exp $
  *-------------------------------------------------------------------
  */
 
@@ -64,7 +64,7 @@ static gboolean findViewInZMap(ZMap zmap, ZMapView view) ;
 static ZMapView addView(ZMap zmap, char *sequence) ;
 
 static void dataLoadCB(ZMapView view, void *app_data) ;
-static void butClickCB(ZMapViewWindow view_window, void *app_data) ;
+static void focusCB(ZMapViewWindow view_window, void *app_data) ;
 static void viewKilledCB(ZMapView view, void *app_data) ;
 static gboolean lookForViewWindow(GNode *node, gpointer data) ;
 
@@ -83,7 +83,7 @@ static ZMapCallbacks zmap_cbs_G = NULL ;
 
 
 /* Callbacks back to us from the level below, i.e. zMapView. */
-ZMapViewCallbacksStruct view_cbs_G = {dataLoadCB, butClickCB, viewKilledCB} ;
+ZMapViewCallbacksStruct view_cbs_G = {dataLoadCB, focusCB, viewKilledCB} ;
 
 
 
@@ -538,7 +538,7 @@ static void dataLoadCB(ZMapView view, void *app_data)
 
 /* Gets called when someone clicks in one of the zmap windows.... 
 * Note that although we get pane data,  */
-static void butClickCB(ZMapViewWindow view_window, void *app_data)
+static void focusCB(ZMapViewWindow view_window, void *app_data)
 {
   ZMap zmap = (ZMap)app_data ;
   ZMapView view = zMapViewGetView(view_window) ;

src/zmapView/zmapView.c

@@ -25,9 +25,9 @@
  * Description: 
  * Exported functions: See ZMap/zmapView.h
  * HISTORY:
- * Last edited: Jul 16 09:42 2004 (edgrif)
+ * Last edited: Jul 16 12:57 2004 (edgrif)
  * Created: Thu May 13 15:28:26 2004 (edgrif)
- * CVS info:   $Id: zmapView.c,v 1.7 2004-07-16 08:46:30 edgrif Exp $
+ * CVS info:   $Id: zmapView.c,v 1.8 2004-07-16 12:01:10 edgrif Exp $
  *-------------------------------------------------------------------
  */
 
@@ -55,7 +55,7 @@ static gint zmapIdleCB(gpointer cb_data) ;
 static void zmapWindowCB(void *cb_data, int reason) ;
 
 void scrollCB(ZMapWindow window, void *caller_data) ;
-void buttonClickCB(ZMapWindow window, void *caller_data) ;
+void focusCB(ZMapWindow window, void *caller_data) ;
 void destroyCB(ZMapWindow window, void *caller_data) ;
 
 static void startStateConnectionChecking(ZMapView zmap_view) ;
@@ -82,7 +82,7 @@ static void killWindows(ZMapView zmap_view) ;
 static ZMapViewCallbacks view_cbs_G = NULL ;
 
 /* Callbacks back to us from the level below, i.e. zMapWindow. */
-ZMapWindowCallbacksStruct window_cbs_G = {scrollCB, buttonClickCB, destroyCB} ;
+ZMapWindowCallbacksStruct window_cbs_G = {scrollCB, focusCB, destroyCB} ;
 
 
 
@@ -102,12 +102,12 @@ void zMapViewInit(ZMapViewCallbacks callbacks)
 {
   zMapAssert(!view_cbs_G) ;
 
-  zMapAssert(callbacks && callbacks->load_data && callbacks->button_click && callbacks->destroy) ;
+  zMapAssert(callbacks && callbacks->load_data && callbacks->focus && callbacks->destroy) ;
 
   view_cbs_G = g_new0(ZMapViewCallbacksStruct, 1) ;
 
   view_cbs_G->load_data = callbacks->load_data ;
-  view_cbs_G->button_click = callbacks->button_click ;
+  view_cbs_G->focus = callbacks->focus ;
   view_cbs_G->destroy = callbacks->destroy ;
 
 
@@ -470,16 +470,15 @@ void scrollCB(ZMapWindow window, void *caller_data)
 }
 
 
-void buttonClickCB(ZMapWindow window, void *caller_data)
+void focusCB(ZMapWindow window, void *caller_data)
 {
   ZMapViewWindow view_window = (ZMapViewWindow)caller_data ;
 
-  printf("In View, in window button click callback\n") ;
 
   /* Is there any focus stuff we want to do here ??? */
 
   /* Pass back a ZMapViewWindow as it has both the View and the window. */
-  (*(view_cbs_G->button_click))(view_window, view_window->parent_view->app_data) ;
+  (*(view_cbs_G->focus))(view_window, view_window->parent_view->app_data) ;
 
   return ;
 }

src/zmapWindow/zmapWindow.c

@@ -28,9 +28,9 @@
  *              
  * Exported functions: See ZMap/zmapWindow.h
  * HISTORY:
- * Last edited: Jul 16 09:41 2004 (edgrif)
+ * Last edited: Jul 16 12:56 2004 (edgrif)
  * Created: Thu Jul 24 14:36:27 2003 (edgrif)
- * CVS info:   $Id: zmapWindow.c,v 1.19 2004-07-16 08:46:29 edgrif Exp $
+ * CVS info:   $Id: zmapWindow.c,v 1.20 2004-07-16 12:01:09 edgrif Exp $
  *-------------------------------------------------------------------
  */
 
@@ -64,12 +64,12 @@ void zMapWindowInit(ZMapWindowCallbacks callbacks)
 {
   zMapAssert(!window_cbs_G) ;
 
-  zMapAssert(callbacks && callbacks->scroll && callbacks->button_click && callbacks->destroy) ;
+  zMapAssert(callbacks && callbacks->scroll && callbacks->focus && callbacks->destroy) ;
 
   window_cbs_G = g_new0(ZMapWindowCallbacksStruct, 1) ;
 
   window_cbs_G->scroll = callbacks->scroll ;
-  window_cbs_G->button_click = callbacks->button_click ;
+  window_cbs_G->focus = callbacks->focus ;
   window_cbs_G->destroy = callbacks->destroy ;
 
   return ;
@@ -383,7 +383,7 @@ static void canvasClickCB(GtkWidget *widget, GdkEventClient *event, gpointer dat
 
 
   /* Call the callers routine for button clicks. */
-  window_cbs_G->button_click(window, window->app_data) ;
+  window_cbs_G->focus(window, window->app_data) ;
 
 
   return ;