[gq-commit] gq/src browse.c,1.74,1.75 input.c,1.63,1.64 input.h,1.14,1.15 schemabrowse.c,1.19,1.20 search.c,1.42,1.43

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

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8587

Modified Files:
	browse.c input.c input.h schemabrowse.c search.c 
Log Message:
* Fixed the popup-menu. Changed the mis-used tearoff menu-item into 
  separator menu-items. Reasons:
  - The tearoff functionality makes no sense for those context sensitive 
    popup menus anyway
  - I think the use of those widgets was mostly to have a separating line 
    in those menus. This broke for gtk2.


Index: browse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** browse.c	9 Oct 2003 05:47:26 -0000	1.74
--- browse.c	10 Oct 2003 06:58:59 -0000	1.75
***************
*** 2036,2040 ****
--- 2036,2044 ----
  	  gtk_menu_set_title(GTK_MENU(menu), name);
  
+ #if GTK_MAJOR >= 2
+ 	  menu_item = gtk_separator_menu_item_new(); 
+ #else
  	  menu_item = gtk_tearoff_menu_item_new();
+ #endif
  	  gtk_menu_append(GTK_MENU(menu), menu_item);
  	  gtk_widget_set_sensitive(menu_item, FALSE);

Index: input.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/input.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** input.c	9 Oct 2003 05:47:26 -0000	1.63
--- input.c	10 Oct 2003 06:58:59 -0000	1.64
***************
*** 183,186 ****
--- 183,187 ----
       /* new attribute button */
       newattrbutton = gtk_button_new();
+      iform->new_attr_button = newattrbutton;
  
       GTK_WIDGET_UNSET_FLAGS(newattrbutton, GTK_CAN_FOCUS);
***************
*** 490,494 ****
--- 491,500 ----
  	  gtk_menu_set_title(GTK_MENU(menu), buf);
  
+ #if GTK_MAJOR >= 2
+ 	  menu_item = gtk_separator_menu_item_new(); 
+ #else
  	  menu_item = gtk_tearoff_menu_item_new();
+ #endif
+ 
  	  gtk_menu_append(GTK_MENU(menu), menu_item);
  	  gtk_widget_set_sensitive(menu_item, FALSE);
***************
*** 515,519 ****
--- 521,529 ----
  	  gtk_menu_append(GTK_MENU(submenu), label);
  
+ #if GTK_MAJOR >= 2
+ 	  menu_item = gtk_separator_menu_item_new(); 
+ #else
  	  menu_item = gtk_tearoff_menu_item_new();
+ #endif
  	  gtk_menu_append(GTK_MENU(submenu), menu_item);
  	  gtk_widget_set_sensitive(menu_item, FALSE);

Index: input.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/input.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** input.h	2 Oct 2003 16:16:26 -0000	1.14
--- input.h	10 Oct 2003 06:58:59 -0000	1.15
***************
*** 32,35 ****
--- 32,36 ----
       GtkWidget *parent_window;
       GtkWidget *target_vbox;
+      GtkWidget *new_attr_button;
       GtkWidget *hide_attr_button;
       GtkWidget *table;

Index: schemabrowse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/schemabrowse.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** schemabrowse.c	8 Oct 2003 22:01:12 -0000	1.19
--- schemabrowse.c	10 Oct 2003 06:58:59 -0000	1.20
***************
*** 318,322 ****
--- 318,326 ----
  	  gtk_menu_item_set_submenu(GTK_MENU_ITEM(root_menu), menu);
  
+ #if GTK_MAJOR >= 2
+ 	  menu_item = gtk_separator_menu_item_new(); 
+ #else
  	  menu_item = gtk_tearoff_menu_item_new();
+ #endif
  	  gtk_menu_append(GTK_MENU(menu), menu_item);
  	  gtk_widget_set_sensitive(menu_item, FALSE);

Index: search.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/search.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** search.c	8 Oct 2003 22:01:12 -0000	1.42
--- search.c	10 Oct 2003 06:58:59 -0000	1.43
***************
*** 689,693 ****
--- 689,697 ----
       menu = gtk_menu_new();
       gtk_menu_item_set_submenu(GTK_MENU_ITEM(root_menu), menu);
+ #if GTK_MAJOR >= 2
+      menu_item = gtk_separator_menu_item_new(); 
+ #else
       menu_item = gtk_tearoff_menu_item_new();
+ #endif
       gtk_menu_append(GTK_MENU(menu), menu_item);
       gtk_widget_set_sensitive(menu_item, FALSE);