comparison gtk/dw.c @ 311:24c1dfffe97e

Unified the callback functions for tree and container widgets.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 31 Mar 2003 09:57:45 +0000
parents 77105fe19c1f
children ff8f23594b15
comparison
equal deleted inserted replaced
310:77105fe19c1f 311:24c1dfffe97e
488 488
489 if(widget && gtk_tree_selection_get_selected(sel, NULL, &iter)) 489 if(widget && gtk_tree_selection_get_selected(sel, NULL, &iter))
490 { 490 {
491 GtkTreeModel *store = (GtkTreeModel *)gtk_object_get_data(GTK_OBJECT(widget), "_dw_tree_store"); 491 GtkTreeModel *store = (GtkTreeModel *)gtk_object_get_data(GTK_OBJECT(widget), "_dw_tree_store");
492 gtk_tree_model_get(store, &iter, 0, &text, 2, &itemdata, 3, &item, -1); 492 gtk_tree_model_get(store, &iter, 0, &text, 2, &itemdata, 3, &item, -1);
493 retval = treeselectfunc(work->window, item, text, itemdata, work->data); 493 retval = treeselectfunc(work->window, item, text, work->data, itemdata);
494 } 494 }
495 } 495 }
496 return retval; 496 return retval;
497 } 497 }
498 #else 498 #else
513 if(work) 513 if(work)
514 { 514 {
515 int (*treeselectfunc)(HWND, HWND, char *, void *, void *) = work->func; 515 int (*treeselectfunc)(HWND, HWND, char *, void *, void *) = work->func;
516 char *text = (char *)gtk_object_get_data(GTK_OBJECT(child), "text"); 516 char *text = (char *)gtk_object_get_data(GTK_OBJECT(child), "text");
517 void *itemdata = (void *)gtk_object_get_data(GTK_OBJECT(child), "itemdata"); 517 void *itemdata = (void *)gtk_object_get_data(GTK_OBJECT(child), "itemdata");
518 retval = treeselectfunc(work->window, child, text, itemdata, work->data); 518 retval = treeselectfunc(work->window, child, text, work->data, itemdata);
519 } 519 }
520 return retval; 520 return retval;
521 } 521 }
522 #endif 522 #endif
523 523
565 565
566 static gint _container_select_row(GtkWidget *widget, gint row, gint column, GdkEventButton *event, gpointer data) 566 static gint _container_select_row(GtkWidget *widget, gint row, gint column, GdkEventButton *event, gpointer data)
567 { 567 {
568 SignalHandler *work = (SignalHandler *)data; 568 SignalHandler *work = (SignalHandler *)data;
569 char *rowdata = gtk_clist_get_row_data(GTK_CLIST(widget), row); 569 char *rowdata = gtk_clist_get_row_data(GTK_CLIST(widget), row);
570 int (*contextfunc)(HWND, char *, void *) = work->func; 570 int (*contextfunc)(HWND, HWND, char *, void *, void *) = work->func;
571 571
572 return contextfunc(work->window, rowdata, work->data);; 572 return contextfunc(work->window, 0, rowdata, work->data, 0);;
573 } 573 }
574 574
575 static gint _unselect_row(GtkWidget *widget, gint row, gint column, GdkEventButton *event, gpointer data) 575 static gint _unselect_row(GtkWidget *widget, gint row, gint column, GdkEventButton *event, gpointer data)
576 { 576 {
577 GList *tmp; 577 GList *tmp;