[gq-commit] gq/src formfill.h,1.20,1.21 input.c,1.44,1.45

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory usw-pr-cvs1:/tmp/cvs-serv6031

Modified Files:
	formfill.h input.c 
Log Message:
* Fixed colouring of attribute names in the browser. This broke when I 
  introduced the Eventboxes to create the popup menues for these labels


Index: formfill.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/formfill.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** formfill.h	13 Jul 2002 16:47:38 -0000	1.20
--- formfill.h	2 Aug 2002 06:11:55 -0000	1.21
***************
*** 90,93 ****
--- 90,94 ----
       struct syntax_handler *syntax;
       
+      GtkWidget *event_box;
       GtkWidget *label;
       GtkWidget *vbox;

Index: input.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/input.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** input.c	17 Jul 2002 21:46:22 -0000	1.44
--- input.c	2 Aug 2002 06:11:55 -0000	1.45
***************
*** 383,387 ****
  
       GtkStyle *not_in_schema, *must_in_schema, *del_schema;
!      GtkWidget *target_table, *label, *inputbox, *arrowbutton, *vbox;
       GtkWidget *widget = NULL, *align;
       struct formfill *form, *focusform;
--- 383,387 ----
  
       GtkStyle *not_in_schema, *must_in_schema, *del_schema;
!      GtkWidget *target_table, *inputbox, *arrowbutton, *vbox;
       GtkWidget *widget = NULL, *align;
       struct formfill *form, *focusform;
***************
*** 415,419 ****
       if (build) {
  	  /* DN input box */
! 	  label = gtk_label_new("dn");
  	  gtk_misc_set_alignment(GTK_MISC(label), LABEL_JUSTIFICATION, .5);
  	  gtk_widget_set_style(label, must_in_schema);
--- 415,419 ----
       if (build) {
  	  /* DN input box */
! 	  GtkWidget *label = gtk_label_new("dn");
  	  gtk_misc_set_alignment(GTK_MISC(label), LABEL_JUSTIFICATION, .5);
  	  gtk_widget_set_style(label, must_in_schema);
***************
*** 450,474 ****
  
  	  if (build || form->label == NULL) {
- 	       GtkWidget *l;
  	       /* attribute name */
  
! 	       l = gtk_label_new(form->attrname);
! 	       gtk_misc_set_alignment(GTK_MISC(l), LABEL_JUSTIFICATION, .5);
! 	       gtk_widget_show(l);
  
! 	       form->label = label = gtk_event_box_new();
! 	       gtk_container_add(GTK_CONTAINER(label), l);
  
  	       if (form->dt_handler && form->dt_handler->selectable) {
! 		    gtk_signal_connect(GTK_OBJECT(label),
  				       "button_press_event",
  				       GTK_SIGNAL_FUNC(widget_button_press),
  				       form);
! 		    gtk_object_set_data(GTK_OBJECT(label), 
  					"row", GINT_TO_POINTER(row));
  	       }
  
! 	       gtk_widget_show(label);
! 	       gtk_table_attach(GTK_TABLE(target_table), label, 
  				0, 1, row, row + 1,
  				/* GTK_FILL| */ GTK_SHRINK, 
--- 450,474 ----
  
  	  if (build || form->label == NULL) {
  	       /* attribute name */
  
! 	       form->label = gtk_label_new(form->attrname);
! 	       gtk_misc_set_alignment(GTK_MISC(form->label),
! 				      LABEL_JUSTIFICATION, .5);
! 	       gtk_widget_show(form->label);
  
! 	       form->event_box = gtk_event_box_new();
! 	       gtk_container_add(GTK_CONTAINER(form->event_box), form->label);
  
  	       if (form->dt_handler && form->dt_handler->selectable) {
! 		    gtk_signal_connect(GTK_OBJECT(form->event_box),
  				       "button_press_event",
  				       GTK_SIGNAL_FUNC(widget_button_press),
  				       form);
! 		    gtk_object_set_data(GTK_OBJECT(form->event_box), 
  					"row", GINT_TO_POINTER(row));
  	       }
  
! 	       gtk_widget_show(form->event_box);
! 	       gtk_table_attach(GTK_TABLE(target_table), form->event_box, 
  				0, 1, row, row + 1,
  				/* GTK_FILL| */ GTK_SHRINK,