[gabedit/f14/master] Even more GTK2 deprecated usage fixes.

Dominik Mierzejewski rathann at fedoraproject.org
Thu Aug 26 22:28:23 UTC 2010


commit 7522b95048c93fb389f2f61a68ec56eb1c6eebed
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Fri Aug 27 00:28:07 2010 +0200

    Even more GTK2 deprecated usage fixes.

 gabedit-gtk.patch | 2779 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 2687 insertions(+), 92 deletions(-)
---
diff --git a/gabedit-gtk.patch b/gabedit-gtk.patch
index 1b0be84..4364184 100644
--- a/gabedit-gtk.patch
+++ b/gabedit-gtk.patch
@@ -1,6 +1,25 @@
+diff -up GabeditSrc230/src/Common/Exit.c.gtk GabeditSrc230/src/Common/Exit.c
+--- GabeditSrc230/src/Common/Exit.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Common/Exit.c	2010-08-27 00:15:29.000000000 +0200
+@@ -170,13 +170,13 @@ void ExitDlg(GtkWidget* w, gpointer data
+ 
+ 
+ 	button = create_button(Win,"No");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,"Yes");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)ExitGabedit,GTK_OBJECT(Win));
+ 	gtk_widget_grab_default(button);
 diff -up GabeditSrc230/src/Common/Install.c.gtk GabeditSrc230/src/Common/Install.c
 --- GabeditSrc230/src/Common/Install.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Common/Install.c	2010-08-26 23:48:10.000000000 +0200
++++ GabeditSrc230/src/Common/Install.c	2010-08-27 00:15:29.000000000 +0200
 @@ -463,13 +463,13 @@ void create_buttons_dialog(GtkWidget* di
    gtk_box_pack_end (GTK_BOX(action_area), button, FALSE, TRUE, 0);
    g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(user_install_cancel_callback),GTK_OBJECT(dialog));
@@ -19,7 +38,7 @@ diff -up GabeditSrc230/src/Common/Install.c.gtk GabeditSrc230/src/Common/Install
    g_signal_connect(G_OBJECT(button), "clicked", (GCallback)user_install_continue_callback,callback);
 diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Preferences.c
 --- GabeditSrc230/src/Common/Preferences.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Common/Preferences.c	2010-08-26 23:49:07.000000000 +0200
++++ GabeditSrc230/src/Common/Preferences.c	2010-08-27 00:15:29.000000000 +0200
 @@ -2149,7 +2149,7 @@ void  create_execucte_commands(GtkWidget
  	gtk_editable_set_editable((GtkEditable*)entry,TRUE);
  	gtk_widget_set_sensitive(entry, TRUE);
@@ -128,7 +147,7 @@ diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Pre
    gtk_widget_grab_default(button);
 diff -up GabeditSrc230/src/Common/Printer.c.gtk GabeditSrc230/src/Common/Printer.c
 --- GabeditSrc230/src/Common/Printer.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Common/Printer.c	2010-08-26 23:49:30.000000000 +0200
++++ GabeditSrc230/src/Common/Printer.c	2010-08-27 00:15:29.000000000 +0200
 @@ -399,20 +399,20 @@ void create_print_page()
    FrameOptions = NULL;
  
@@ -153,9 +172,38 @@ diff -up GabeditSrc230/src/Common/Printer.c.gtk GabeditSrc230/src/Common/Printer
    gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0);
    g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(print_file),NULL);
    g_signal_connect_swapped(GTK_OBJECT(button), "clicked",G_CALLBACK(destroy_children),GTK_OBJECT(Wins));
+diff -up GabeditSrc230/src/Common/Run.c.gtk GabeditSrc230/src/Common/Run.c
+--- GabeditSrc230/src/Common/Run.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Common/Run.c	2010-08-27 00:15:29.000000000 +0200
+@@ -382,7 +382,7 @@ GtkWidget* create_text_result_command(Gt
+   gtk_widget_realize(Win);
+   button = create_button(Win,_("OK"));
+   gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 5);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,G_OBJECT(Win));
+   gtk_widget_show (button);
+@@ -5108,14 +5108,14 @@ void create_run_dialogue_box(GtkWidget *
+   gtk_widget_realize(fp);
+ 
+   button = create_button(fp,"Cancel");
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,G_OBJECT(fp));
+   gtk_widget_show (button);
+ 
+   button = create_button(fp,"OK");
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+ 
 diff -up GabeditSrc230/src/Common/SplashScreen.c.gtk GabeditSrc230/src/Common/SplashScreen.c
 --- GabeditSrc230/src/Common/SplashScreen.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Common/SplashScreen.c	2010-08-26 22:17:15.000000000 +0200
++++ GabeditSrc230/src/Common/SplashScreen.c	2010-08-27 00:15:29.000000000 +0200
 @@ -352,7 +352,7 @@ static gint expose_event(GtkWidget  *wid
    	pixmap = (GdkPixmap *)g_object_get_data(G_OBJECT(widget), "Pixmap");
  	if(pixmap)
@@ -167,7 +215,7 @@ diff -up GabeditSrc230/src/Common/SplashScreen.c.gtk GabeditSrc230/src/Common/Sp
                    event->area.x, event->area.y,
 diff -up GabeditSrc230/src/Files/FileChooser.c.gtk GabeditSrc230/src/Files/FileChooser.c
 --- GabeditSrc230/src/Files/FileChooser.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Files/FileChooser.c	2010-08-26 23:46:22.000000000 +0200
++++ GabeditSrc230/src/Files/FileChooser.c	2010-08-27 00:15:29.000000000 +0200
 @@ -487,14 +487,14 @@ void Save_YesNo()
      Bouton = create_button(DialogueMessage,_("Cancel"));
      gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0);
@@ -194,9 +242,133 @@ diff -up GabeditSrc230/src/Files/FileChooser.c.gtk GabeditSrc230/src/Files/FileC
  
  
  
+diff -up GabeditSrc230/src/Files/ListeFiles.c.gtk GabeditSrc230/src/Files/ListeFiles.c
+--- GabeditSrc230/src/Files/ListeFiles.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Files/ListeFiles.c	2010-08-27 00:15:29.000000000 +0200
+@@ -525,7 +525,7 @@ static void create_info_win()
+   	gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE);
+ 	button = create_button(fp,"OK");
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp));
+@@ -866,14 +866,14 @@ static void create_set_dialogue_window()
+ 	hbox = create_hbox(vboxwin);
+ 
+ 	button = create_button(fp,_("Cancel"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(fp,"OK");
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_object_set_data(G_OBJECT(fp),"Entrys",entrys);
+@@ -2445,14 +2445,14 @@ static void  create_window_list_to_clear
+   /* The CANCEL button */
+   button = create_button(Dialogue,_("Cancel"));
+   gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dialogue)->action_area), button, FALSE, TRUE, 5);  
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_button_windows,GTK_OBJECT(Dialogue));
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Dialogue));
+ 
+     /* The OK button */
+   button = create_button(Dialogue,"OK");
+   gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Dialogue)->action_area), button, FALSE, TRUE, 5);  
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   g_signal_connect(G_OBJECT(button), "clicked",(GCallback)to_clear_lists,NULL);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_button_windows,GTK_OBJECT(Dialogue));
+diff -up GabeditSrc230/src/FireFly/FireFly.c.gtk GabeditSrc230/src/FireFly/FireFly.c
+--- GabeditSrc230/src/FireFly/FireFly.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/FireFly/FireFly.c	2010-08-27 00:15:32.000000000 +0200
+@@ -198,7 +198,7 @@ static void fireflyInputFileWindow(gbool
+ 	button = create_button(Wins,_("Cancel"));
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Wins,_("OK"));
+@@ -223,7 +223,7 @@ static void fireflyInputFileWindow(gbool
+ 
+ 
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins));
+diff -up GabeditSrc230/src/Gamess/Gamess.c.gtk GabeditSrc230/src/Gamess/Gamess.c
+--- GabeditSrc230/src/Gamess/Gamess.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Gamess/Gamess.c	2010-08-27 00:15:31.000000000 +0200
+@@ -181,7 +181,7 @@ static void gamessInputFileWindow(gboole
+ 	button = create_button(Wins,_("Cancel"));
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Wins,_("OK"));
+@@ -206,7 +206,7 @@ static void gamessInputFileWindow(gboole
+ 
+ 
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins));
+diff -up GabeditSrc230/src/Gaussian/Gaussian.c.gtk GabeditSrc230/src/Gaussian/Gaussian.c
+--- GabeditSrc230/src/Gaussian/Gaussian.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Gaussian/Gaussian.c	2010-08-27 00:15:29.000000000 +0200
+@@ -1131,12 +1131,12 @@ void insert_gaussian(gint itype)
+   button = create_button(Wins,"Cancel");
+   gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(to_cancel_win),GTK_OBJECT(Wins));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_show (button);
+ 
+   button = create_button(Wins,"OK");
+   gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);  
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect(G_OBJECT(button), "clicked", (GCallback)GetInfoAll,NULL);
+@@ -1198,7 +1198,7 @@ void gauss(gint ioption)
+ 	gtk_box_set_homogeneous (GTK_BOX( GTK_DIALOG(Wins)->action_area), TRUE); 
+ 
+ 	button = create_button(Wins,_("Cancel"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(G_OBJECT(button),"clicked",G_CALLBACK(to_cancel_win),GTK_OBJECT(Wins));
+ 	gtk_widget_show (button);
+@@ -1206,7 +1206,7 @@ void gauss(gint ioption)
+ 	button = create_button(Wins,_("OK"));
+ 	g_signal_connect(G_OBJECT(button), "clicked", (GCallback)putInfoAll,NULL);
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 
 diff -up GabeditSrc230/src/Gaussian/GInterfaceBasis.c.gtk GabeditSrc230/src/Gaussian/GInterfaceBasis.c
 --- GabeditSrc230/src/Gaussian/GInterfaceBasis.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Gaussian/GInterfaceBasis.c	2010-08-26 23:38:44.000000000 +0200
++++ GabeditSrc230/src/Gaussian/GInterfaceBasis.c	2010-08-27 00:15:29.000000000 +0200
 @@ -506,13 +506,13 @@ static void DialogueEditC(GtkWidget *w,g
    Bouton = create_button(Dialogue,_("Cancel"));
    gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
@@ -213,9 +385,277 @@ diff -up GabeditSrc230/src/Gaussian/GInterfaceBasis.c.gtk GabeditSrc230/src/Gaus
    gtk_widget_grab_default(Bouton);
  
    gtk_widget_show_all(Dialogue);
+@@ -668,13 +668,13 @@ static void DialogueEditT(GtkWidget *w,g
+   Bouton = create_button(Dialogue,_("Cancel"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+ 
+   Bouton = create_button(Dialogue,_("OK"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)EditBasisT, NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+ 
+   gtk_widget_show_all(Dialogue);
+diff -up GabeditSrc230/src/Geometry/BuildLinear.c.gtk GabeditSrc230/src/Geometry/BuildLinear.c
+--- GabeditSrc230/src/Geometry/BuildLinear.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/BuildLinear.c	2010-08-27 00:15:30.000000000 +0200
+@@ -235,14 +235,14 @@ void build_linear_molecule_dlg()
+   Button = create_button(Dlg,_("Cancel"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dlg)->action_area), Button,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)delete_child,GTK_OBJECT(Dlg));
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+ 
+   /* The "OK" button */
+   Button = create_button(Dlg,_("OK"));
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dlg)->action_area), Button,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)build_linear_molecule,NULL);
+   g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)delete_child,GTK_OBJECT(Dlg));
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_grab_default(Button);
+     
+ 
+diff -up GabeditSrc230/src/Geometry/BuildNanoTube.c.gtk GabeditSrc230/src/Geometry/BuildNanoTube.c
+--- GabeditSrc230/src/Geometry/BuildNanoTube.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/BuildNanoTube.c	2010-08-27 00:15:30.000000000 +0200
+@@ -268,14 +268,14 @@ void build_nanotube_dlg()
+   Button = create_button(Dlg,_("Cancel"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dlg)->action_area), Button,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)delete_child,GTK_OBJECT(Dlg));
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+ 
+   /* The "OK" button */
+   Button = create_button(Dlg,_("OK"));
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dlg)->action_area), Button,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)build_nanotube,NULL);
+   g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)delete_child,GTK_OBJECT(Dlg));
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_grab_default(Button);
+     
+   gtk_widget_show_all(GTK_DIALOG(Dlg)->vbox);
+diff -up GabeditSrc230/src/Geometry/BuildPolyNucleicAcid.c.gtk GabeditSrc230/src/Geometry/BuildPolyNucleicAcid.c
+--- GabeditSrc230/src/Geometry/BuildPolyNucleicAcid.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/BuildPolyNucleicAcid.c	2010-08-27 00:15:30.000000000 +0200
+@@ -2471,7 +2471,7 @@ void build_polynucleicacid_dlg()
+   gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dlg)->action_area), Button, FALSE, TRUE, 5);  
+   g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)destroyDlg,GTK_OBJECT(Dlg));
+ 
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_grab_default(Button);
+     
+   WinPNADlg = Dlg;
+diff -up GabeditSrc230/src/Geometry/BuildPolyPeptide.c.gtk GabeditSrc230/src/Geometry/BuildPolyPeptide.c
+--- GabeditSrc230/src/Geometry/BuildPolyPeptide.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/BuildPolyPeptide.c	2010-08-27 00:15:30.000000000 +0200
+@@ -1561,7 +1561,7 @@ void build_polypeptide_dlg()
+   gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dlg)->action_area), Button, FALSE, TRUE, 2);
+   g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)destroy_dlg,GTK_OBJECT(Dlg));
+ 
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_grab_default(Button);
+   gtk_widget_show_all(GTK_DIALOG(Dlg)->vbox);
+   gtk_widget_show_all(GTK_DIALOG(Dlg)->action_area);
+diff -up GabeditSrc230/src/Geometry/BuildPolySaccharide.c.gtk GabeditSrc230/src/Geometry/BuildPolySaccharide.c
+--- GabeditSrc230/src/Geometry/BuildPolySaccharide.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/BuildPolySaccharide.c	2010-08-27 00:15:30.000000000 +0200
+@@ -927,7 +927,7 @@ void build_polysaccharide_dlg()
+   gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dlg)->action_area), Button, FALSE, TRUE, 5);  
+   g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)destroy_dlg,GTK_OBJECT(Dlg));
+ 
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_grab_default(Button);
+   gtk_widget_show_all(GTK_DIALOG(Dlg)->vbox);
+   gtk_widget_show_all(GTK_DIALOG(Dlg)->action_area);
+diff -up GabeditSrc230/src/Geometry/BuildRing.c.gtk GabeditSrc230/src/Geometry/BuildRing.c
+--- GabeditSrc230/src/Geometry/BuildRing.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/BuildRing.c	2010-08-27 00:15:30.000000000 +0200
+@@ -246,14 +246,14 @@ void build_ring_molecule_dlg()
+   Button = create_button(Dlg,_("Cancel"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dlg)->action_area), Button,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)delete_child,GTK_OBJECT(Dlg));
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+ 
+   /* The "OK" button */
+   Button = create_button(Dlg,_("OK"));
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dlg)->action_area), Button,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)build_ring_molecule,NULL);
+   g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)delete_child,GTK_OBJECT(Dlg));
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_grab_default(Button);
+ 
+   gtk_widget_show_all(GTK_DIALOG(Dlg)->vbox);
+diff -up GabeditSrc230/src/Geometry/BuildRoZPhi.c.gtk GabeditSrc230/src/Geometry/BuildRoZPhi.c
+--- GabeditSrc230/src/Geometry/BuildRoZPhi.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/BuildRoZPhi.c	2010-08-27 00:15:30.000000000 +0200
+@@ -343,7 +343,7 @@ void build_rozphi_molecule_dlg()
+   Button = create_button(Dlg,_("Close"));
+   gtk_box_pack_end (GTK_BOX(GTK_DIALOG(Dlg)->action_area), Button, FALSE, TRUE, 5);  
+   g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)delete_child,GTK_OBJECT(Dlg));
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_grab_default(Button);
+ 
+   gtk_widget_show_all(GTK_DIALOG(Dlg)->vbox);
 diff -up GabeditSrc230/src/Geometry/DrawGeom.c.gtk GabeditSrc230/src/Geometry/DrawGeom.c
 --- GabeditSrc230/src/Geometry/DrawGeom.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Geometry/DrawGeom.c	2010-08-26 22:17:15.000000000 +0200
++++ GabeditSrc230/src/Geometry/DrawGeom.c	2010-08-27 00:15:31.000000000 +0200
+@@ -3053,13 +3053,13 @@ void selectResidueByNameDlg()
+ 	button = create_button(winDlg,_("Cancel"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 
+ 	button = create_button(winDlg,_("OK"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(button), "clicked",(GCallback)selectResidueByName,entry);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+     
+ 
+@@ -3145,13 +3145,13 @@ void selectResidueByNumberDlg()
+ 	button = create_button(winDlg,_("Cancel"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 
+ 	button = create_button(winDlg,_("OK"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(button), "clicked",(GCallback)selectResidueByNumber,entry);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+     
+ 
+@@ -3273,13 +3273,13 @@ void selectAtomsByMMTypeDlg()
+ 	button = create_button(winDlg,_("Cancel"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 
+ 	button = create_button(winDlg,_("OK"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(button), "clicked",(GCallback)selectAtomsByMMType,entry);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+     
+ 
+@@ -3401,13 +3401,13 @@ void selectAtomsByPDBTypeDlg()
+ 	button = create_button(winDlg,_("Cancel"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 
+ 	button = create_button(winDlg,_("OK"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(button), "clicked",(GCallback)selectAtomsByPDBType,entry);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+     
+ 
+@@ -3529,13 +3529,13 @@ void selectAtomsBySymbolDlg()
+ 	button = create_button(winDlg,_("Cancel"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 
+ 	button = create_button(winDlg,_("OK"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(button), "clicked",(GCallback)selectAtomsBySymbol,entry);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+     
+ 
+@@ -3663,13 +3663,13 @@ void setMMTypeOfselectedAtomsDlg()
+ 	button = create_button(winDlg,_("Cancel"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 
+ 	button = create_button(winDlg,_("OK"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(button), "clicked",(GCallback)setMMTypeOfselectedAtoms,entry);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+     
+ 
+@@ -3762,13 +3762,13 @@ void setPDBTypeOfselectedAtomsDlg()
+ 	button = create_button(winDlg,_("Cancel"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 
+ 	button = create_button(winDlg,_("OK"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(button), "clicked",(GCallback)setPDBTypeOfselectedAtoms,entry);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+     
+ 
+@@ -3898,13 +3898,13 @@ void setChargeOfselectedAtomsDlg()
+ 	button = create_button(winDlg,_("Cancel"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 
+ 	button = create_button(winDlg,_("OK"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(button), "clicked",(GCallback)setChargeOfselectedAtoms,entry);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+     
+ 
+@@ -3978,13 +3978,13 @@ void scaleChargesOfSelectedAtomsDlg()
+ 	button = create_button(winDlg,_("Cancel"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 
+ 	button = create_button(winDlg,_("OK"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(winDlg)->action_area), button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(button), "clicked",(GCallback)scaleChargesOfSelectedAtoms,entry);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(winDlg));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+     
+ 
 @@ -6841,7 +6841,7 @@ gint motion_notify(GtkWidget *widget, Gd
  static void redraw()
  {
@@ -236,7 +676,7 @@ diff -up GabeditSrc230/src/Geometry/DrawGeom.c.gtk GabeditSrc230/src/Geometry/Dr
                    event->area.x, event->area.y,
 diff -up GabeditSrc230/src/Geometry/EnergiesCurves.c.gtk GabeditSrc230/src/Geometry/EnergiesCurves.c
 --- GabeditSrc230/src/Geometry/EnergiesCurves.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Geometry/EnergiesCurves.c	2010-08-26 22:17:15.000000000 +0200
++++ GabeditSrc230/src/Geometry/EnergiesCurves.c	2010-08-27 00:15:30.000000000 +0200
 @@ -156,7 +156,7 @@ static gint expose_event (GtkWidget *wid
  {
  	GdkPixmap *pixmap = (GdkPixmap*)(g_object_get_data(G_OBJECT(widget),"Pixmap")); 
@@ -255,91 +695,1858 @@ diff -up GabeditSrc230/src/Geometry/EnergiesCurves.c.gtk GabeditSrc230/src/Geome
                    pixmap,
                    0,0,
                    0,0,
-diff -up GabeditSrc230/src/Geometry/PreviewGeom.c.gtk GabeditSrc230/src/Geometry/PreviewGeom.c
---- GabeditSrc230/src/Geometry/PreviewGeom.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Geometry/PreviewGeom.c	2010-08-26 22:17:15.000000000 +0200
-@@ -729,7 +729,7 @@ static void redraw(GtkWidget *drawingAre
- 	PrevData* prevData = (PrevData*)g_object_get_data(G_OBJECT (drawingArea), "PrevData");
- 	if(!prevData)return;
- 	gdk_draw_drawable(drawingArea->window,
--                  drawingArea->style->fg_gc[GTK_WIDGET_STATE (drawingArea)],
-+                  drawingArea->style->fg_gc[gtk_widget_get_state(drawingArea)],
-                   prevData->pixmap,
-                   0,0,
-                   0,0,
-@@ -902,7 +902,7 @@ static gboolean expose_event( GtkWidget 
- 	if(event->count >0) return FALSE;
- 	if(!prevData)return FALSE;
- 	gdk_draw_drawable(widget->window,
--                  widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-+                  widget->style->fg_gc[gtk_widget_get_state(widget)],
-                   prevData->pixmap,
-                   event->area.x, event->area.y,
-                   event->area.x, event->area.y,
-diff -up GabeditSrc230/src/OpenGL/ColorMap.c.gtk GabeditSrc230/src/OpenGL/ColorMap.c
---- GabeditSrc230/src/OpenGL/ColorMap.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/OpenGL/ColorMap.c	2010-08-26 22:17:15.000000000 +0200
-@@ -643,7 +643,7 @@ static gint expose_event(GtkWidget  *wid
-   	pixmap = (GdkPixmap *)g_object_get_data(G_OBJECT(widget), "Pixmap");
- 	if(pixmap)
- 		gdk_draw_drawable(widget->window,
--                  widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-+                  widget->style->fg_gc[gtk_widget_get_state(widget)],
-                   pixmap,
-                   event->area.x, event->area.y,
-                   event->area.x, event->area.y,
-diff -up GabeditSrc230/src/OpenGL/GLArea.c.gtk GabeditSrc230/src/OpenGL/GLArea.c
---- GabeditSrc230/src/OpenGL/GLArea.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/OpenGL/GLArea.c	2010-08-26 22:17:15.000000000 +0200
-@@ -781,7 +781,7 @@ gint init(GtkWidget *widget)
- {
- 	/* OpenGL functions can be called only if make_current returns true */
- 	if(!GTK_IS_WIDGET(widget)) return TRUE;
--	if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
-+	if(!gtk_widget_get_realized(widget)) return TRUE;
- 	if (gtk_gl_area_make_current(GTK_GL_AREA(widget)))
- 	{
- 		glViewport(0,0, widget->allocation.width, widget->allocation.height);
-@@ -1029,7 +1029,7 @@ gint redrawGL2PS()
- 	GLdouble m[4][4];
- 	GtkWidget *widget = GLArea;
- 	if(!GTK_IS_WIDGET(widget)) return TRUE;
--	if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
-+	if(!gtk_widget_get_realized(widget)) return TRUE;
+@@ -680,20 +680,20 @@ GtkWidget *add_energies_curve( GtkWidget
+ 	button = create_button(WindowEnergies,"Close");
+ 	g_signal_connect_swapped(G_OBJECT(button),"clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WindowEnergies));
+ 	gtk_box_pack_end(GTK_BOX(vbox), button,FALSE,FALSE,1);
+-  	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  	gtk_widget_set_can_default(button, TRUE);
+   	gtk_widget_grab_default(button);
  
-     	glMatrixMode(GL_PROJECTION);
-     	glLoadIdentity();
-@@ -1088,7 +1088,7 @@ gint redraw(GtkWidget *widget, gpointer 
- {
- 	GLdouble m[4][4];
- 	if(!GTK_IS_WIDGET(widget)) return TRUE;
--	if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
-+	if(!gtk_widget_get_realized(widget)) return TRUE;
- 	if (!gtk_gl_area_make_current(GTK_GL_AREA(widget))) return FALSE;
+ 	/*
+ 	button = create_button(WindowEnergies,"Movie");
+ 	g_signal_connect_swapped(G_OBJECT(button),"clicked", (GCallback)movie_geom,GTK_OBJECT(dessin));
+ 	gtk_box_pack_end(GTK_BOX(vbox), button,FALSE,FALSE,1);
+-  	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  	gtk_widget_set_can_default(button, TRUE);
+ 	*/
  
-     	glMatrixMode(GL_PROJECTION);
-@@ -1153,7 +1153,7 @@ gint draw(GtkWidget *widget, GdkEventExp
- 	static gint i = 0;
- 	i++;
- 	if (!GTK_IS_WIDGET(widget)) return TRUE;
--	if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
-+	if(!gtk_widget_get_realized(widget)) return TRUE;
- 	/* Draw only last expose. */
- 	if (event->count > 0) return FALSE;
+ 	button = create_button(WindowEnergies,"Draw");
+ 	g_signal_connect_swapped(G_OBJECT(button),"clicked", (GCallback)draw_geom,GTK_OBJECT(WindowEnergies));
+ 	gtk_box_pack_end(GTK_BOX(vbox), button,FALSE,FALSE,1);
+-  	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  	gtk_widget_set_can_default(button, TRUE);
  
-@@ -1167,7 +1167,7 @@ gint draw(GtkWidget *widget, GdkEventExp
- gint reshape(GtkWidget *widget, GdkEventConfigure *event)
- {
- 	if (!GTK_IS_WIDGET(widget)) return TRUE;
--	if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
-+	if(!gtk_widget_get_realized(widget)) return TRUE;
+ 	g_object_set_data(G_OBJECT (dessin), "Geometry", GeomConv);
+ 	
+diff -up GabeditSrc230/src/Geometry/GeomXYZ.c.gtk GabeditSrc230/src/Geometry/GeomXYZ.c
+--- GabeditSrc230/src/Geometry/GeomXYZ.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/GeomXYZ.c	2010-08-27 00:15:30.000000000 +0200
+@@ -2115,14 +2115,14 @@ static void DialogueTransInVar()
+   Bouton = create_button(Dialogue,_("No"));
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+  
+   Bouton = create_button(Dialogue,_("Yes"));
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)trans_allGeomXYZ_to_variables, NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+     
  
- 	/* OpenGL functions can be called only if make_current returns true */
- 	if (gtk_gl_area_make_current(GTK_GL_AREA(widget)))
-diff -up GabeditSrc230/src/OpenGL/TriangleDraw.c.gtk GabeditSrc230/src/OpenGL/TriangleDraw.c
---- GabeditSrc230/src/OpenGL/TriangleDraw.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/OpenGL/TriangleDraw.c	2010-08-26 23:50:01.000000000 +0200
-@@ -474,19 +474,19 @@ void set_opacity_dlg()
+   gtk_widget_show_all(Dialogue);
+@@ -2171,14 +2171,14 @@ static void DialogueTransInConst()
+   Bouton = create_button(Dialogue,_("No"));
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+  
+   Bouton = create_button(Dialogue,_("Yes"));
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)trans_allVariables_to_Constants, NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+     
+ 
+   gtk_widget_show_all(Dialogue);
+@@ -2768,13 +2768,13 @@ static void DialogueAdd(GtkWidget *w,gpo
+   Bouton = create_button(Dialogue,_("Cancel"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+ 
+   Bouton = create_button(Dialogue,_("OK"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked",(GCallback)AddAtom,Entry[E_SYMBOL]);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)destroy_dialogue,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+     
+ 
+@@ -2933,13 +2933,13 @@ static void DialogueEdit()
+   Bouton = create_button(Dialogue,_("Cancel"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+ 
+   Bouton = create_button(Dialogue,_("OK"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked",(GCallback)EditAtom,Entry[E_SYMBOL]);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)destroy_dialogue,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+     
+ 
+@@ -2990,14 +2990,14 @@ static void DialogueDelete()
+   Bouton = create_button(Dialogue,_("No"));
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+  
+   Bouton = create_button(Dialogue,_("Yes"));
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked",(GCallback)DelAtom, NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+     
+ 
+   gtk_widget_show_all(Dialogue);
+@@ -11304,7 +11304,7 @@ void create_window_save_xyzmol2tinkerpdb
+ 
+   button = create_button(fp,_("OK"));
+   gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(save_xyzmol2tinkerpdbhin_file),GTK_OBJECT(fp));
+@@ -11314,7 +11314,7 @@ void create_window_save_xyzmol2tinkerpdb
+   gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 3);
+   g_signal_connect_swapped(G_OBJECT(button),"clicked",(GCallback)delete_child,GTK_OBJECT(fp));
+   gtk_widget_show (button);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+ 
+ 
+   g_free(labelt);
+@@ -11582,14 +11582,14 @@ static void DialogueDeleteV()
+   Bouton = create_button(Dialogue,"No");
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+ 
+   Bouton = create_button(Dialogue,"Yes");
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked",(GCallback)DelVariable, NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+     
+ 
+   gtk_widget_show_all(Dialogue);
+@@ -11649,13 +11649,13 @@ static void DialogueEditV()
+   Bouton = create_button(Dialogue,_("Cancel"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+ 
+   Bouton = create_button(Dialogue,_("OK"));
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked",(GCallback)EditVariable,NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)destroy_dialogue,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+     
+ 
+@@ -11755,13 +11755,13 @@ static void DialogueAddV()
+   Bouton = create_button(Dialogue,_("Cancel"));
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+ 
+   Bouton = create_button(Dialogue,_("OK"));
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked",(GCallback)AddVariable,NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)destroy_dialogue,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+     
+ 
+diff -up GabeditSrc230/src/Geometry/GeomZmatrix.c.gtk GabeditSrc230/src/Geometry/GeomZmatrix.c
+--- GabeditSrc230/src/Geometry/GeomZmatrix.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/GeomZmatrix.c	2010-08-27 00:15:30.000000000 +0200
+@@ -2420,11 +2420,11 @@ void create_window_save_zmat()
+   gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 3);
+   g_signal_connect_swapped(G_OBJECT(button),"clicked",(GCallback)delete_child,GTK_OBJECT(fp));
+   gtk_widget_show (button);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+ 
+   button = create_button(fp,_("OK"));
+   gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(save_gmzmatrix_file),GTK_OBJECT(fp));
+@@ -2681,14 +2681,14 @@ static void DialogueTransInVar()
+   Bouton = create_button(Dialogue,"No");
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+  
+   Bouton = create_button(Dialogue,"Yes");
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)trans_allGeom_to_variables, NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+     
+ 
+   gtk_widget_show_all(Dialogue);
+@@ -2923,14 +2923,14 @@ static void DialogueTransInConst()
+   Bouton = create_button(Dialogue,"No");
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+  
+   Bouton = create_button(Dialogue,"Yes");
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)trans_allVariables_to_Constants,NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+     
+ 
+   gtk_widget_show_all(Dialogue);
+@@ -3641,13 +3641,13 @@ static void DialogueAdd()
+   Bouton = create_button(Dialogue,_("Cancel"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+ 
+   Bouton = create_button(Dialogue,_("OK"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)AddAtom, Entry[E_SYMBOL]);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_dialogue, GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+     
+ 
+@@ -3840,13 +3840,13 @@ static void DialogueEdit()
+   Bouton = create_button(Dialogue,_("Cancel"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+ 
+   Bouton = create_button(Dialogue,_("OK"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)EditAtom, Entry[E_SYMBOL]);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_dialogue, GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+     
+ 
+@@ -3899,14 +3899,14 @@ static void DialogueDelete()
+   Bouton = create_button(Dialogue,"No");
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+  
+   Bouton = create_button(Dialogue,"Yes");
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked",(GCallback)DelAtom, NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+     
+ 
+   gtk_widget_show_all(Dialogue);
+@@ -6713,14 +6713,14 @@ static void DialogueDeleteV()
+   Bouton = create_button(Dialogue,"No");
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+  
+   Bouton = create_button(Dialogue,"Yes");
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked",(GCallback)DelVariable, NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+     
+ 
+   gtk_widget_show_all(Dialogue);
+@@ -6778,13 +6778,13 @@ static void DialogueEditV()
+   Bouton = create_button(Dialogue,_("Cancel"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+ 
+   Bouton = create_button(Dialogue,_("OK"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)EditVariable, NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_dialogue, GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+     
+ 
+@@ -6885,13 +6885,13 @@ static void DialogueAddV()
+   Bouton = create_button(Dialogue,_("Cancel"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)delete_child,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+ 
+   Bouton = create_button(Dialogue,_("OK"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)AddVariable, NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_dialogue, GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+     
+ 
+diff -up GabeditSrc230/src/Geometry/OpenBabel.c.gtk GabeditSrc230/src/Geometry/OpenBabel.c
+--- GabeditSrc230/src/Geometry/OpenBabel.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/OpenBabel.c	2010-08-27 00:15:30.000000000 +0200
+@@ -701,7 +701,7 @@ void create_babel_dialogue()
+ 
+ 
+ 
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 
+@@ -888,13 +888,13 @@ GtkWidget* create_babel_read_save_dialog
+ 	g_object_set_data (G_OBJECT (fp), "EntryFileName", entry);
+ 	g_object_set_data (G_OBJECT (fp), "EntryCombo", entryCombo);
+ 
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 
+ 	button = create_button(fp,"Cancel");
+ 	gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 2);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(delete_child),G_OBJECT(fp));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 
+ 	combo = g_object_get_data (G_OBJECT (frame), "Combo");
+         g_signal_connect_swapped(G_OBJECT(GTK_COMBO_BOX(combo)), "changed",G_CALLBACK(changed_type), entry);
+diff -up GabeditSrc230/src/Geometry/PersonalFragments.c.gtk GabeditSrc230/src/Geometry/PersonalFragments.c
+--- GabeditSrc230/src/Geometry/PersonalFragments.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/PersonalFragments.c	2010-08-27 00:15:30.000000000 +0200
+@@ -268,12 +268,12 @@ void newGroupeDlg(gpointer data, guint O
+ 	Button = create_button(WinDlg,_("Cancel"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,_("OK"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)addGroupe,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+@@ -407,12 +407,12 @@ void deleteGroupeDlg(gpointer data, guin
+ 	Button = create_button(WinDlg,_("Cancel"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,_("OK"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)deleteOneGroupe,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+@@ -676,12 +676,12 @@ void addFragmentDlg(gpointer data, guint
+ 	Button = create_button(WinDlg,_("Cancel"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,_("OK"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)addFragment,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+@@ -869,12 +869,12 @@ void deleteFragmentDlg(gpointer data, gu
+ 	Button = create_button(WinDlg,_("Cancel"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,_("OK"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)deleteOneFragment,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+diff -up GabeditSrc230/src/Geometry/Povray.c.gtk GabeditSrc230/src/Geometry/Povray.c
+--- GabeditSrc230/src/Geometry/Povray.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/Povray.c	2010-08-27 00:15:30.000000000 +0200
+@@ -1262,19 +1262,19 @@ void exportPOVGeomDlg(GtkWidget *parentW
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,"Save");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)savePOVRay,GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,"Run PovRay");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)runPOVRay,GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+diff -up GabeditSrc230/src/Geometry/PreviewGeom.c.gtk GabeditSrc230/src/Geometry/PreviewGeom.c
+--- GabeditSrc230/src/Geometry/PreviewGeom.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/PreviewGeom.c	2010-08-27 00:15:30.000000000 +0200
+@@ -729,7 +729,7 @@ static void redraw(GtkWidget *drawingAre
+ 	PrevData* prevData = (PrevData*)g_object_get_data(G_OBJECT (drawingArea), "PrevData");
+ 	if(!prevData)return;
+ 	gdk_draw_drawable(drawingArea->window,
+-                  drawingArea->style->fg_gc[GTK_WIDGET_STATE (drawingArea)],
++                  drawingArea->style->fg_gc[gtk_widget_get_state(drawingArea)],
+                   prevData->pixmap,
+                   0,0,
+                   0,0,
+@@ -902,7 +902,7 @@ static gboolean expose_event( GtkWidget 
+ 	if(event->count >0) return FALSE;
+ 	if(!prevData)return FALSE;
+ 	gdk_draw_drawable(widget->window,
+-                  widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++                  widget->style->fg_gc[gtk_widget_get_state(widget)],
+                   prevData->pixmap,
+                   event->area.x, event->area.y,
+                   event->area.x, event->area.y,
+diff -up GabeditSrc230/src/Geometry/ResultsAnalise.c.gtk GabeditSrc230/src/Geometry/ResultsAnalise.c
+--- GabeditSrc230/src/Geometry/ResultsAnalise.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/ResultsAnalise.c	2010-08-27 00:15:30.000000000 +0200
+@@ -2605,7 +2605,7 @@ void create_bar_result(GtkWidget* Vbox)
+   /* The Update Button */
+   Button = create_button(Fenetre,_("Update"));
+   gtk_box_pack_start (GTK_BOX(vboxframe ), Button, FALSE, TRUE, 2);
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_grab_default(Button);
+   gtk_widget_show(Button);
+   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)view_result,NULL);
+@@ -2613,25 +2613,25 @@ void create_bar_result(GtkWidget* Vbox)
+   Button = create_button(Fenetre,_("Go to end"));
+   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)goto_end_result,NULL);
+   gtk_box_pack_start (GTK_BOX(vboxframe ), Button, FALSE, TRUE, 2);
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_show(Button);
+ 
+   Button = create_button(Fenetre,_("Update/end"));
+   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)view_result_end,NULL);
+   gtk_box_pack_start (GTK_BOX(vboxframe ), Button, FALSE, TRUE, 2);
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_show(Button);
+ 
+   Button = create_button(Fenetre,_("Geom. Conv."));
+   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)find_energy_all,NULL);
+   gtk_box_pack_start (GTK_BOX(vboxframe ), Button, FALSE, TRUE, 2);
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_show(Button);
+ 
+   Button = create_button(Fenetre,_("Dens. Orb."));
+   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)draw_density_orbitals_gamess_or_gauss_or_molcas_or_molpro,NULL);
+   gtk_box_pack_start (GTK_BOX(vboxframe ), Button, FALSE, TRUE, 2);
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_show(Button);
+ 
+   frame = gtk_frame_new (_("Remote"));
+@@ -2668,7 +2668,7 @@ void create_bar_result(GtkWidget* Vbox)
+   Button = create_button(Fenetre,_("Get All files"));
+   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)get_file_frome_remote_host,&all);
+   gtk_box_pack_start (GTK_BOX(vboxframe ), Button, FALSE, TRUE, 2);
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_show(Button);
+   g_object_set_data(G_OBJECT (ResultRemoteFrame), "AllButton",Button);
+   g_signal_connect_swapped(G_OBJECT (ResultEntryPass), "activate",
+@@ -2678,7 +2678,7 @@ void create_bar_result(GtkWidget* Vbox)
+   Button = create_button(Fenetre,_("Get log file"));
+   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)get_file_frome_remote_host,&log);
+   gtk_box_pack_start (GTK_BOX(vboxframe ), Button, FALSE, TRUE, 2);
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_show(Button);
+   g_object_set_data(G_OBJECT (ResultRemoteFrame), "LogButton",Button);
+ 
+@@ -2686,7 +2686,7 @@ void create_bar_result(GtkWidget* Vbox)
+   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)get_file_frome_remote_host,&out);
+ 
+   gtk_box_pack_start (GTK_BOX(vboxframe ), Button, FALSE, TRUE, 2);
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_show(Button);
+   g_object_set_data(G_OBJECT (ResultRemoteFrame), "OutButton",Button);
+ 
+@@ -2694,7 +2694,7 @@ void create_bar_result(GtkWidget* Vbox)
+   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)get_file_frome_remote_host,&mol);
+ 
+   gtk_box_pack_start (GTK_BOX(vboxframe ), Button, FALSE, TRUE, 2);
+-  GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Button, TRUE);
+   gtk_widget_show(Button);
+   g_object_set_data(G_OBJECT (ResultRemoteFrame), "AuxButton",Button);
+ }
+diff -up GabeditSrc230/src/Geometry/Symmetry.c.gtk GabeditSrc230/src/Geometry/Symmetry.c
+--- GabeditSrc230/src/Geometry/Symmetry.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/Symmetry.c	2010-08-27 00:15:30.000000000 +0200
+@@ -525,7 +525,7 @@ void create_symmetry_window(GtkWidget* w
+   
+   Bouton = create_button(Dialogue,"OK");
+   gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dialogue)->action_area), Bouton, FALSE, TRUE, 5);  
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(Dialogue));
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue));
+@@ -568,7 +568,7 @@ void create_geometry_paxis_window(GtkWid
+   
+   Bouton = create_button(Dialogue,"OK");
+   gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dialogue)->action_area), Bouton, FALSE, TRUE, 5);  
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(Dialogue));
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue));
+diff -up GabeditSrc230/src/Molcas/MolcasBasis.c.gtk GabeditSrc230/src/Molcas/MolcasBasis.c
+--- GabeditSrc230/src/Molcas/MolcasBasis.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Molcas/MolcasBasis.c	2010-08-27 00:15:29.000000000 +0200
+@@ -460,7 +460,7 @@ GtkWidget* createMolcasBasisWindow()
+ 	button = create_button(dlgWin,_("Cancel"));
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dlgWin)->action_area), button, FALSE, TRUE, 5);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(destroy_children),GTK_OBJECT(dlgWin));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_show (button);
+ 	/*
+ 	for(i=0;i<NHBOX;i++) BoiteHP[i] = NULL;
+@@ -468,7 +468,7 @@ GtkWidget* createMolcasBasisWindow()
+ 	*/
+ 	button = create_button(dlgWin,"OK");
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dlgWin)->action_area), button, FALSE, TRUE, 5);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(destroy_children),GTK_OBJECT(dlgWin));
+diff -up GabeditSrc230/src/Molcas/MolcasBasisLibrary.c.gtk GabeditSrc230/src/Molcas/MolcasBasisLibrary.c
+--- GabeditSrc230/src/Molcas/MolcasBasisLibrary.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Molcas/MolcasBasisLibrary.c	2010-08-27 00:15:29.000000000 +0200
+@@ -808,13 +808,13 @@ static void newAtomDlg()
+ 	Button = create_button(WinDlg,"Cancel");
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,"OK");
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)newAtom,GTK_OBJECT(WinDlg));
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+@@ -1001,13 +1001,13 @@ static void newBasisDlg()
+ 	Button = create_button(WinDlg,"Cancel");
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,"OK");
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)newBasis,GTK_OBJECT(WinDlg));
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+@@ -1189,13 +1189,13 @@ static void editBasisDlg()
+ 	Button = create_button(WinDlg,"Cancel");
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,"OK");
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)editBasis,GTK_OBJECT(WinDlg));
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+diff -up GabeditSrc230/src/Molcas/Molcas.c.gtk GabeditSrc230/src/Molcas/Molcas.c
+--- GabeditSrc230/src/Molcas/Molcas.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Molcas/Molcas.c	2010-08-27 00:15:29.000000000 +0200
+@@ -188,7 +188,7 @@ static void molcasInputFileWindow(gboole
+ 	button = create_button(Wins,_("Cancel"));
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_show (button);
+ 
+ 
+@@ -213,7 +213,7 @@ static void molcasInputFileWindow(gboole
+ 	createScfFrame(Wins, hbox, button);
+ 
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins));
+diff -up GabeditSrc230/src/Molcas/MolcasGateWay.c.gtk GabeditSrc230/src/Molcas/MolcasGateWay.c
+--- GabeditSrc230/src/Molcas/MolcasGateWay.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Molcas/MolcasGateWay.c	2010-08-27 00:15:29.000000000 +0200
+@@ -1555,7 +1555,7 @@ static void createViewInfoAbelianGroupWi
+ 
+ 	Bouton = create_button(Dialogue,"OK");
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dialogue)->action_area), Bouton, FALSE, TRUE, 5);	
+-	GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Bouton, TRUE);
+ 	gtk_widget_grab_default(Bouton);
+ 	g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(Dialogue));
+ 	g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue));
+diff -up GabeditSrc230/src/MolecularMechanics/MolecularMechanicsDlg.c.gtk GabeditSrc230/src/MolecularMechanics/MolecularMechanicsDlg.c
+--- GabeditSrc230/src/MolecularMechanics/MolecularMechanicsDlg.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/MolecularMechanics/MolecularMechanicsDlg.c	2010-08-27 00:15:31.000000000 +0200
+@@ -3917,13 +3917,13 @@ void MolecularMechanicsEnergyDlg()
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(DestroyWinMMDlg),GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,"Ok");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)amberEnergyCalculation,GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+@@ -3960,13 +3960,13 @@ void MolecularMechanicsMinimizeDlg()
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(DestroyWinMMDlg),GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,"Ok");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)amberMinimize,GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+@@ -4006,13 +4006,13 @@ void MolecularMechanicsDynamicsDlg()
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,"Ok");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)amberMolecularDynamics,GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+@@ -4051,13 +4051,13 @@ void MolecularMechanicsDynamicsConfoDlg(
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,"Ok");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)amberMolecularDynamicsConfo,GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+diff -up GabeditSrc230/src/MolecularMechanics/SetMMParameters.c.gtk GabeditSrc230/src/MolecularMechanics/SetMMParameters.c
+--- GabeditSrc230/src/MolecularMechanics/SetMMParameters.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/MolecularMechanics/SetMMParameters.c	2010-08-27 00:15:31.000000000 +0200
+@@ -1020,14 +1020,14 @@ static void editnewPairWiseDlg(GabeditSi
+ 	Button = create_button(WinDlg,"Cancel");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 
+ 	Button = create_button(WinDlg,"OK");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+ 	  
+ 	gtk_widget_show_all(WinDlg);
+@@ -1150,14 +1150,14 @@ static void editnewNonBondedDlg(GabeditS
+ 	Button = create_button(WinDlg,"Cancel");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 
+ 	Button = create_button(WinDlg,"OK");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+ 	  
+ 	gtk_widget_show_all(WinDlg);
+@@ -1348,7 +1348,7 @@ static void editnewHBondDlg(GabeditSigna
+ 	Button = create_button(WinDlg,"Cancel");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 
+ 
+@@ -1356,7 +1356,7 @@ static void editnewHBondDlg(GabeditSigna
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+ 	  
+ 	gtk_widget_show_all(WinDlg);
+@@ -1565,14 +1565,14 @@ static void editnewImproperDlg(GabeditSi
+ 	Button = create_button(WinDlg,"Cancel");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 
+ 	Button = create_button(WinDlg,"OK");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+ 	  
+ 	gtk_widget_show_all(WinDlg);
+@@ -1832,14 +1832,14 @@ static void editnewTorsionDlg(GabeditSig
+ 	Button = create_button(WinDlg,"Cancel");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 
+ 	Button = create_button(WinDlg,"OK");
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+ 	  
+ 	gtk_widget_show_all(WinDlg);
+@@ -2021,14 +2021,14 @@ static void editnewBendDlg(GabeditSignal
+ 	Button = create_button(WinDlg,"Cancel");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 
+ 	Button = create_button(WinDlg,"OK");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+ 	  
+ 	gtk_widget_show_all(WinDlg);
+@@ -2190,13 +2190,13 @@ static void editnewBondDlg(GabeditSignal
+ 	Button = create_button(WinDlg,"Cancel");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,"OK");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+ 	  
+ 
+@@ -2371,13 +2371,13 @@ static void editnewTypeDlg(GabeditSignal
+ 	Button = create_button(WinDlg,"Cancel");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,"OK");
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f, NULL);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+ 	  
+ 
+diff -up GabeditSrc230/src/MolecularMechanics/SetPDBTemplate.c.gtk GabeditSrc230/src/MolecularMechanics/SetPDBTemplate.c
+--- GabeditSrc230/src/MolecularMechanics/SetPDBTemplate.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/MolecularMechanics/SetPDBTemplate.c	2010-08-27 00:15:31.000000000 +0200
+@@ -513,12 +513,12 @@ static void editnewDlg(GabeditSignalFunc
+ 	Button = create_button(WinDlg,_("Cancel"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,_("OK"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)f,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+diff -up GabeditSrc230/src/Molpro/MInterfaceBasis.c.gtk GabeditSrc230/src/Molpro/MInterfaceBasis.c
+--- GabeditSrc230/src/Molpro/MInterfaceBasis.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Molpro/MInterfaceBasis.c	2010-08-27 00:15:32.000000000 +0200
+@@ -964,14 +964,14 @@ static void DialogueDelete(GtkWidget *w)
+   Bouton = create_button(Dialogue,"No");
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+ 
+   Bouton = create_button(Dialogue,"Yes");
+   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked",(GCallback)DelAtomList, NULL);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+ 
+   gtk_widget_show_all(Dialogue);
+ }
+@@ -1077,7 +1077,7 @@ static void DialogueAdd(GtkWidget *w,gpo
+   button = create_button(FenetreTable,_("Cancel"));
+   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(FenetreTable));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show(button);
+   
+diff -up GabeditSrc230/src/Molpro/MolproBasisLibrary.c.gtk GabeditSrc230/src/Molpro/MolproBasisLibrary.c
+--- GabeditSrc230/src/Molpro/MolproBasisLibrary.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Molpro/MolproBasisLibrary.c	2010-08-27 00:15:32.000000000 +0200
+@@ -824,13 +824,13 @@ static void newAtomDlg()
+ 	Button = create_button(WinDlg,_("Cancel"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,_("OK"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)newAtom,GTK_OBJECT(WinDlg));
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+@@ -958,13 +958,13 @@ static void newBasisDlg()
+ 	Button = create_button(WinDlg,"Cancel");
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,_("OK"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)newBasis,GTK_OBJECT(WinDlg));
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+diff -up GabeditSrc230/src/Molpro/Molpro.c.gtk GabeditSrc230/src/Molpro/Molpro.c
+--- GabeditSrc230/src/Molpro/Molpro.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Molpro/Molpro.c	2010-08-27 00:15:32.000000000 +0200
+@@ -703,12 +703,12 @@ void insert_molpro(gint itype)
+   button = create_button(Wins,_("Cancel"));
+   gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( to_cancel_win),GTK_OBJECT(Wins));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_show (button);
+ 
+   button = create_button(Wins,_("OK"));
+   gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);  
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect(G_OBJECT(button), "clicked", (GCallback)GetInfo,NULL);
+@@ -748,14 +748,14 @@ void molpro()
+   gtk_widget_realize(Wins);
+ 
+   button = create_button(Wins,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( to_cancel_win),GTK_OBJECT(Wins));
+   gtk_widget_show (button);
+ 
+   /*
+   button = create_button(Wins,"SAVE&CLOSE");
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0);
+   g_signal_connect(G_OBJECT(button), "clicked",(GCallback)GetInfo,&iframe);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(destroy_children),GTK_OBJECT(Wins));
+@@ -766,7 +766,7 @@ void molpro()
+   hboxb=gtk_hbox_new(TRUE,2);
+   gtk_container_add (GTK_CONTAINER (hboxb),  create_label_pixmap(Wins,next_xpm,"Next"));
+   gtk_container_add (GTK_CONTAINER (button), hboxb);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0);
+   gtk_widget_show (button);
+   gtk_widget_grab_default(button);
+diff -up GabeditSrc230/src/Mopac/Mopac.c.gtk GabeditSrc230/src/Mopac/Mopac.c
+--- GabeditSrc230/src/Mopac/Mopac.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Mopac/Mopac.c	2010-08-27 00:15:31.000000000 +0200
+@@ -175,7 +175,7 @@ static void mopacInputFileWindow(gboolea
+ 	button = create_button(Wins,_("Cancel"));
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Wins,_("OK"));
+@@ -196,7 +196,7 @@ static void mopacInputFileWindow(gboolea
+ 	gtk_widget_set_sensitive(hbox, FALSE);
+ 
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins));
+diff -up GabeditSrc230/src/MPQC/MPQCBasisLibrary.c.gtk GabeditSrc230/src/MPQC/MPQCBasisLibrary.c
+--- GabeditSrc230/src/MPQC/MPQCBasisLibrary.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/MPQC/MPQCBasisLibrary.c	2010-08-27 00:15:29.000000000 +0200
+@@ -778,13 +778,13 @@ static void newAtomDlg()
+ 	Button = create_button(WinDlg,_("Cancel"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,_("OK"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)newAtom,GTK_OBJECT(WinDlg));
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+@@ -915,13 +915,13 @@ static void newBasisDlg()
+ 	Button = create_button(WinDlg,_("Cancel"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,_("OK"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)newBasis,GTK_OBJECT(WinDlg));
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+@@ -1034,13 +1034,13 @@ static void editBasisDlg()
+ 	Button = create_button(WinDlg,_("Cancel"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 
+ 	Button = create_button(WinDlg,_("OK"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)editBasis,GTK_OBJECT(WinDlg));
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+     
+ 
+diff -up GabeditSrc230/src/MPQC/MPQC.c.gtk GabeditSrc230/src/MPQC/MPQC.c
+--- GabeditSrc230/src/MPQC/MPQC.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/MPQC/MPQC.c	2010-08-27 00:15:29.000000000 +0200
+@@ -192,7 +192,7 @@ static void mpqcInputFileWindow(gboolean
+ 	button = create_button(Wins,_("Cancel"));
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Wins,"OK");
+@@ -220,7 +220,7 @@ static void mpqcInputFileWindow(gboolean
+ 	createMPQCProperties(hbox);
+ 
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins));
+diff -up GabeditSrc230/src/MPQC/MPQCFunctionals.c.gtk GabeditSrc230/src/MPQC/MPQCFunctionals.c
+--- GabeditSrc230/src/MPQC/MPQCFunctionals.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/MPQC/MPQCFunctionals.c	2010-08-27 00:15:29.000000000 +0200
+@@ -574,7 +574,7 @@ void mpqcSumDensityFunctionalWindow()
+ 
+ 	button = create_button(win,_("OK"));
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(win)->action_area), button, FALSE, TRUE, 5);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(setSumDensityFunctionals),GTK_OBJECT(win));
+@@ -583,7 +583,7 @@ void mpqcSumDensityFunctionalWindow()
+ 	button = create_button(win,_("Close"));
+   	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(win)->action_area), button, FALSE, TRUE, 5);  
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(destroy_children),GTK_OBJECT(win));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_show (button);
+ 
+ 	gtk_widget_show_all(win);
+diff -up GabeditSrc230/src/NetWork/Batch.c.gtk GabeditSrc230/src/NetWork/Batch.c
+--- GabeditSrc230/src/NetWork/Batch.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/NetWork/Batch.c	2010-08-27 00:15:32.000000000 +0200
+@@ -355,14 +355,14 @@ static void create_kill_batch(GtkWidget*
+   gtk_widget_realize(fp);
+ 
+   button = create_button(fp,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp));
+   gtk_widget_show (button);
+ 
+   button = create_button(fp,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)kill_batch,GTK_OBJECT(Win));
+@@ -669,14 +669,14 @@ void create_batch_remote(gboolean all)
+   gtk_widget_realize(fp);
+ 
+   button = create_button(fp,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp));
+   gtk_widget_show (button);
+ 
+   button = create_button(fp,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT (EntryPassWord ), "activate", (GCallback) gtk_button_clicked, GTK_OBJECT (button));
+@@ -839,7 +839,7 @@ static GtkWidget* create_list_result_com
+   gtk_widget_realize(Win);
+   button = create_button(Win,_("OK"));
+   gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 5);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_win_user_batch,GTK_OBJECT(Win));
+   gtk_widget_show (button);
+diff -up GabeditSrc230/src/NetWork/Process.c.gtk GabeditSrc230/src/NetWork/Process.c
+--- GabeditSrc230/src/NetWork/Process.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/NetWork/Process.c	2010-08-27 00:15:32.000000000 +0200
+@@ -482,14 +482,14 @@ void create_process_remote(gboolean all)
+   gtk_widget_realize(fp);
+ 
+   button = create_button(fp,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp));
+   gtk_widget_show (button);
+ 
+   button = create_button(fp,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT (EntryPassWord ), "activate", (GCallback) gtk_button_clicked, GTK_OBJECT (button));
+@@ -720,14 +720,14 @@ static void create_kill_process(GtkWidge
+   gtk_widget_realize(fp);
+ 
+   button = create_button(fp,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp));
+   gtk_widget_show (button);
+ 
+   button = create_button(fp,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)kill_process,GTK_OBJECT(Win));
+@@ -1102,7 +1102,7 @@ static GtkWidget* create_list_result_com
+   gtk_widget_realize(Win);
+   button = create_button(Win,_("OK"));
+   gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 5);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_win_user_process,GTK_OBJECT(Win));
+   gtk_widget_show (button);
+diff -up GabeditSrc230/src/OpenGL/AnimationGeomConv.c.gtk GabeditSrc230/src/OpenGL/AnimationGeomConv.c
+--- GabeditSrc230/src/OpenGL/AnimationGeomConv.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/AnimationGeomConv.c	2010-08-27 00:15:32.000000000 +0200
+@@ -4743,7 +4743,7 @@ static GtkWidget*   add_inputGauss_entry
+ 	gtk_editable_set_editable((GtkEditable*)entry,FALSE);
+ 	gtk_widget_set_sensitive(entry, FALSE);
+ 	button = create_button_pixmap(Wins,open_xpm,NULL);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
+                                      G_CALLBACK(set_entry_inputGaussDir_selection),
+                                      GTK_OBJECT(entry));
+@@ -4816,7 +4816,7 @@ static void  add_cancel_ok_button(GtkWid
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,_("Cancel"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+@@ -4824,7 +4824,7 @@ static void  add_cancel_ok_button(GtkWid
+ 
+ 	button = create_button(Win,_("OK"));
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)myFunc,GTK_OBJECT(Win));
+diff -up GabeditSrc230/src/OpenGL/AnimationMD.c.gtk GabeditSrc230/src/OpenGL/AnimationMD.c
+--- GabeditSrc230/src/OpenGL/AnimationMD.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/AnimationMD.c	2010-08-27 00:15:31.000000000 +0200
+@@ -2044,7 +2044,7 @@ static GtkWidget*   add_inputGauss_entry
+ 	gtk_editable_set_editable((GtkEditable*)entry,FALSE);
+ 	gtk_widget_set_sensitive(entry, FALSE);
+ 	button = create_button_pixmap(Wins,open_xpm,NULL);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
+                                      G_CALLBACK(set_entry_inputGaussDir_selection),
+                                      GTK_OBJECT(entry));
+@@ -2117,7 +2117,7 @@ void  add_cancel_ok_button(GtkWidget *Wi
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+@@ -2125,7 +2125,7 @@ void  add_cancel_ok_button(GtkWidget *Wi
+ 
+ 	button = create_button(Win,"OK");
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)myFunc,GTK_OBJECT(Win));
+diff -up GabeditSrc230/src/OpenGL/CaptureOrbitals.c.gtk GabeditSrc230/src/OpenGL/CaptureOrbitals.c
+--- GabeditSrc230/src/OpenGL/CaptureOrbitals.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/CaptureOrbitals.c	2010-08-27 00:15:31.000000000 +0200
+@@ -183,14 +183,14 @@ static void create_images_window (gint n
+ 
+ 	button = create_button(window,"Screen capture PNG");
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)export_png_file_dlg,G_OBJECT(table));
+ 
+ 	button = create_button(window,"Screen capture JPEG");
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)export_jpeg_file_dlg,G_OBJECT(table));
+ 
+@@ -1120,13 +1120,13 @@ void capture_orbitals_dlg()
+ 
+ 	button = create_button(Win,"OK");
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_capture_orbitals,G_OBJECT(Win));
+ 
+ 	button = create_button(Win,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
+diff -up GabeditSrc230/src/OpenGL/ColorMap.c.gtk GabeditSrc230/src/OpenGL/ColorMap.c
+--- GabeditSrc230/src/OpenGL/ColorMap.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/ColorMap.c	2010-08-27 00:15:32.000000000 +0200
+@@ -643,7 +643,7 @@ static gint expose_event(GtkWidget  *wid
+   	pixmap = (GdkPixmap *)g_object_get_data(G_OBJECT(widget), "Pixmap");
+ 	if(pixmap)
+ 		gdk_draw_drawable(widget->window,
+-                  widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++                  widget->style->fg_gc[gtk_widget_get_state(widget)],
+                   pixmap,
+                   event->area.x, event->area.y,
+                   event->area.x, event->area.y,
+diff -up GabeditSrc230/src/OpenGL/Contours.c.gtk GabeditSrc230/src/OpenGL/Contours.c
+--- GabeditSrc230/src/OpenGL/Contours.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/Contours.c	2010-08-27 00:15:32.000000000 +0200
+@@ -467,7 +467,7 @@ void create_contours_isosurface()
+   gtk_widget_realize(Win);
+ 
+   button = create_button(Win,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+@@ -475,7 +475,7 @@ void create_contours_isosurface()
+ 
+   button = create_button(Win,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_contours_isosurface,GTK_OBJECT(Win));
+@@ -887,7 +887,7 @@ void create_contours(gchar* title,gint t
+   gtk_widget_realize(Win);
+ 
+   button = create_button(Win,"Cancel");
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+@@ -895,7 +895,7 @@ void create_contours(gchar* title,gint t
+ 
+   button = create_button(Win,"OK");
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_contours,GTK_OBJECT(Win));
+@@ -1130,14 +1130,14 @@ void create_contours_plane(gchar* title)
+   gtk_widget_realize(Win);
+ 
+   button = create_button(Win,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+   gtk_widget_show (button);
+ 
+   button = create_button(Win,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_contours_plane,GTK_OBJECT(Win));
+diff -up GabeditSrc230/src/OpenGL/Dipole.c.gtk GabeditSrc230/src/OpenGL/Dipole.c
+--- GabeditSrc230/src/OpenGL/Dipole.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/Dipole.c	2010-08-27 00:15:31.000000000 +0200
+@@ -144,7 +144,7 @@ static void create_dipole_window(gdouble
+     
+ 	Button = create_button(Dialogue,"OK");
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dialogue)->action_area), Button, FALSE, TRUE, 5);  
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(Dialogue));
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue));
+diff -up GabeditSrc230/src/OpenGL/GLArea.c.gtk GabeditSrc230/src/OpenGL/GLArea.c
+--- GabeditSrc230/src/OpenGL/GLArea.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/GLArea.c	2010-08-27 00:15:32.000000000 +0200
+@@ -781,7 +781,7 @@ gint init(GtkWidget *widget)
+ {
+ 	/* OpenGL functions can be called only if make_current returns true */
+ 	if(!GTK_IS_WIDGET(widget)) return TRUE;
+-	if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
++	if(!gtk_widget_get_realized(widget)) return TRUE;
+ 	if (gtk_gl_area_make_current(GTK_GL_AREA(widget)))
+ 	{
+ 		glViewport(0,0, widget->allocation.width, widget->allocation.height);
+@@ -1029,7 +1029,7 @@ gint redrawGL2PS()
+ 	GLdouble m[4][4];
+ 	GtkWidget *widget = GLArea;
+ 	if(!GTK_IS_WIDGET(widget)) return TRUE;
+-	if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
++	if(!gtk_widget_get_realized(widget)) return TRUE;
+ 
+     	glMatrixMode(GL_PROJECTION);
+     	glLoadIdentity();
+@@ -1088,7 +1088,7 @@ gint redraw(GtkWidget *widget, gpointer 
+ {
+ 	GLdouble m[4][4];
+ 	if(!GTK_IS_WIDGET(widget)) return TRUE;
+-	if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
++	if(!gtk_widget_get_realized(widget)) return TRUE;
+ 	if (!gtk_gl_area_make_current(GTK_GL_AREA(widget))) return FALSE;
+ 
+     	glMatrixMode(GL_PROJECTION);
+@@ -1153,7 +1153,7 @@ gint draw(GtkWidget *widget, GdkEventExp
+ 	static gint i = 0;
+ 	i++;
+ 	if (!GTK_IS_WIDGET(widget)) return TRUE;
+-	if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
++	if(!gtk_widget_get_realized(widget)) return TRUE;
+ 	/* Draw only last expose. */
+ 	if (event->count > 0) return FALSE;
+ 
+@@ -1167,7 +1167,7 @@ gint draw(GtkWidget *widget, GdkEventExp
+ gint reshape(GtkWidget *widget, GdkEventConfigure *event)
+ {
+ 	if (!GTK_IS_WIDGET(widget)) return TRUE;
+-	if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
++	if(!gtk_widget_get_realized(widget)) return TRUE;
+ 
+ 	/* OpenGL functions can be called only if make_current returns true */
+ 	if (gtk_gl_area_make_current(GTK_GL_AREA(widget)))
+diff -up GabeditSrc230/src/OpenGL/GridAdfOrbitals.c.gtk GabeditSrc230/src/OpenGL/GridAdfOrbitals.c
+--- GabeditSrc230/src/OpenGL/GridAdfOrbitals.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/GridAdfOrbitals.c	2010-08-27 00:15:32.000000000 +0200
+@@ -422,7 +422,7 @@ static void create_list_adf_orbitals()
+   gtk_widget_realize(Win);
+ 
+   button = create_button(Win,"Cancel");
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+@@ -430,7 +430,7 @@ static void create_list_adf_orbitals()
+ 
+   button = create_button(Win,"OK");
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect(G_OBJECT(button), "clicked",(GCallback)read_orbital,gtklist);
+diff -up GabeditSrc230/src/OpenGL/GridCP.c.gtk GabeditSrc230/src/OpenGL/GridCP.c
+--- GabeditSrc230/src/OpenGL/GridCP.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/GridCP.c	2010-08-27 00:15:32.000000000 +0200
+@@ -1152,13 +1152,13 @@ static GtkWidget* showResultDlg(gchar *m
+   
+ 	button = create_button(dlgWin,_("Partial charges of molecule <= AIM charges"));
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(dlgWin)->action_area), button, FALSE, TRUE, 5);  
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)setPartialChargeToAIM, GTK_OBJECT(dlgWin));
+ 
+ 	button = create_button(dlgWin,"Close");
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(dlgWin)->action_area), button, FALSE, TRUE, 5);  
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroyResultDlg, GTK_OBJECT(dlgWin));
+ 
+diff -up GabeditSrc230/src/OpenGL/GridCube.c.gtk GabeditSrc230/src/OpenGL/GridCube.c
+--- GabeditSrc230/src/OpenGL/GridCube.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/GridCube.c	2010-08-27 00:15:32.000000000 +0200
+@@ -317,7 +317,7 @@ void create_scale_dlg()
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,_("Cancel"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+@@ -325,7 +325,7 @@ void create_scale_dlg()
+ 
+ 	button = create_button(Win,_("OK"));
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)applyScale,GTK_OBJECT(Win));
+@@ -1507,14 +1507,14 @@ static void create_window_list_orbitals_
+   gtk_widget_realize(fp);
+ 
+   button = create_button(fp,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(fp));
+   gtk_widget_show (button);
+ 
+   button = create_button(fp,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_object_set_data(G_OBJECT (button), "Window", fp);
+diff -up GabeditSrc230/src/OpenGL/GridMolcas.c.gtk GabeditSrc230/src/OpenGL/GridMolcas.c
+--- GabeditSrc230/src/OpenGL/GridMolcas.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/GridMolcas.c	2010-08-27 00:15:32.000000000 +0200
+@@ -529,7 +529,7 @@ static void create_list_molcasgrid_orbit
+   gtk_widget_realize(Win);
+ 
+   button = create_button(Win,"Cancel");
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+@@ -537,7 +537,7 @@ static void create_list_molcasgrid_orbit
+ 
+   button = create_button(Win,"OK");
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect(G_OBJECT(button), "clicked",(GCallback)read_orbital,gtklist);
+diff -up GabeditSrc230/src/OpenGL/GridPlans.c.gtk GabeditSrc230/src/OpenGL/GridPlans.c
+--- GabeditSrc230/src/OpenGL/GridPlans.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/GridPlans.c	2010-08-27 00:15:31.000000000 +0200
+@@ -567,7 +567,7 @@ void create_planeGrid_center_vector(gcha
+   gtk_widget_realize(Win);
+ 
+   button = create_button(Win,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+@@ -575,7 +575,7 @@ void create_planeGrid_center_vector(gcha
+ 
+   button = create_button(Win,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_object_set_data(G_OBJECT (Win), "Type",planeFor[itype]);
+diff -up GabeditSrc230/src/OpenGL/GridQChem.c.gtk GabeditSrc230/src/OpenGL/GridQChem.c
+--- GabeditSrc230/src/OpenGL/GridQChem.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/GridQChem.c	2010-08-27 00:15:32.000000000 +0200
+@@ -472,14 +472,14 @@ void create_window_list_grids(GtkWidget 
+ 	gtk_widget_realize(fp);
+ 
+ 	button = create_button(fp,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(fp));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(fp,"OK");
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_object_set_data(G_OBJECT (button), "Window", fp);
+diff -up GabeditSrc230/src/OpenGL/IntegralOrbitals.c.gtk GabeditSrc230/src/OpenGL/IntegralOrbitals.c
+--- GabeditSrc230/src/OpenGL/IntegralOrbitals.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/IntegralOrbitals.c	2010-08-27 00:15:31.000000000 +0200
+@@ -1234,13 +1234,13 @@ void coulomb_orbitals_dlg()
+ 
+ 	button = create_button(Win,_("OK"));
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_coulomb_orbitals,G_OBJECT(Win));
+ 
+ 	button = create_button(Win,_("Cancel"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
+@@ -1816,13 +1816,13 @@ void transition_matrix_orbitals_dlg()
+ 
+ 	button = create_button(Win,_("OK"));
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_transition_matrix,G_OBJECT(Win));
+ 
+ 	button = create_button(Win,_("Cancel"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
+@@ -2297,13 +2297,13 @@ void spatial_overlap_orbitals_dlg()
+ 
+ 	button = create_button(Win,_("OK"));
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_spatial_overlap,G_OBJECT(Win));
+ 
+ 	button = create_button(Win,_("Cancel"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
+diff -up GabeditSrc230/src/OpenGL/LabelsGL.c.gtk GabeditSrc230/src/OpenGL/LabelsGL.c
+--- GabeditSrc230/src/OpenGL/LabelsGL.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/LabelsGL.c	2010-08-27 00:15:32.000000000 +0200
+@@ -746,19 +746,19 @@ void set_title_dlg()
+ 
+ 	button = create_button(Win,_("OK"));
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_set_title_close,G_OBJECT(Win));
+ 
+ 	button = create_button(Win,_("Apply"));
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_set_title,G_OBJECT(Win));
+ 
+ 	button = create_button(Win,_("Cancel"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
+diff -up GabeditSrc230/src/OpenGL/Orbitals.c.gtk GabeditSrc230/src/OpenGL/Orbitals.c
+--- GabeditSrc230/src/OpenGL/Orbitals.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/Orbitals.c	2010-08-27 00:15:32.000000000 +0200
+@@ -466,7 +466,7 @@ static void cut_ceof_orbitals_win(GtkWid
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,_("Cancel"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+@@ -474,7 +474,7 @@ static void cut_ceof_orbitals_win(GtkWid
+ 
+ 	button = create_button(Win,_("OK"));
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)applycutoff,GTK_OBJECT(Win));
+@@ -1050,7 +1050,7 @@ void create_iso_orbitals()
+   gtk_widget_realize(Win);
+ 
+   button = create_button(Win,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+@@ -1058,7 +1058,7 @@ void create_iso_orbitals()
+ 
+   button = create_button(Win,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)applyiso,GTK_OBJECT(Win));
+@@ -1159,7 +1159,7 @@ void create_list_orbitals()
+   gtk_widget_realize(Win);
+ 
+   button = create_button(Win,_("Close"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 2);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroyWinsList, GTK_OBJECT(Win));
+   gtk_widget_show (button);
+@@ -1186,7 +1186,7 @@ void create_list_orbitals()
+ 
+   button = create_button(Win,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 2);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)create_grid_orbitals,GTK_OBJECT(Win));
+diff -up GabeditSrc230/src/OpenGL/OrbitalsMolpro.c.gtk GabeditSrc230/src/OpenGL/OrbitalsMolpro.c
+--- GabeditSrc230/src/OpenGL/OrbitalsMolpro.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/OrbitalsMolpro.c	2010-08-27 00:15:31.000000000 +0200
+@@ -1739,14 +1739,14 @@ void create_window_list_orbitals(GtkWidg
+   gtk_widget_realize(fp);
+ 
+   button = create_button(fp,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(fp));
+   gtk_widget_show (button);
+ 
+   button = create_button(fp,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_object_set_data(G_OBJECT (button), "Window", fp);
+diff -up GabeditSrc230/src/OpenGL/PlanesMapped.c.gtk GabeditSrc230/src/OpenGL/PlanesMapped.c
+--- GabeditSrc230/src/OpenGL/PlanesMapped.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/PlanesMapped.c	2010-08-27 00:15:31.000000000 +0200
+@@ -173,7 +173,7 @@ void create_maps(gchar* title,gint type)
+   gtk_widget_realize(Win);
+ 
+   button = create_button(Win,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+@@ -181,7 +181,7 @@ void create_maps(gchar* title,gint type)
+ 
+   button = create_button(Win,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_maps,GTK_OBJECT(Win));
+@@ -279,14 +279,14 @@ void create_maps_plane(gchar* title)
+   gtk_widget_realize(Win);
+ 
+   button = create_button(Win,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+   gtk_widget_show (button);
+ 
+   button = create_button(Win,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_maps_plane,GTK_OBJECT(Win));
+diff -up GabeditSrc230/src/OpenGL/PovrayGL.c.gtk GabeditSrc230/src/OpenGL/PovrayGL.c
+--- GabeditSrc230/src/OpenGL/PovrayGL.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/PovrayGL.c	2010-08-27 00:15:32.000000000 +0200
+@@ -1869,19 +1869,19 @@ void exportPOVDlg(GtkWidget *parentWindo
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,"Save");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)savePOVRay,GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,"Run PovRay");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)runPOVRay,GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+diff -up GabeditSrc230/src/OpenGL/PreferencesOrb.c.gtk GabeditSrc230/src/OpenGL/PreferencesOrb.c
+--- GabeditSrc230/src/OpenGL/PreferencesOrb.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/PreferencesOrb.c	2010-08-27 00:15:32.000000000 +0200
+@@ -158,14 +158,14 @@ void set_colors_surfaces(gchar* title)
+   gtk_widget_realize(Win);
+ 
+   button = create_button(Win,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_selectors_window,GTK_OBJECT(Win));
+   gtk_widget_show_all (button);
+ 
+   button = create_button(Win,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show_all (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_colorselections,GTK_OBJECT(Win));
+@@ -514,20 +514,20 @@ void set_camera()
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,_("Close"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy, GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,_("Apply"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_camera, GTK_OBJECT(Win));
+ 
+ 	button = create_button(Win,_("OK"));
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 
+@@ -570,14 +570,14 @@ void set_light_positions(gchar* title)
+   gtk_widget_realize(Win);
+ 
+   button = create_button(Win,_("Cancel"));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_setlight_window, GTK_OBJECT(Win));
+   gtk_widget_show (button);
+ 
+   button = create_button(Win,_("OK"));
+   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_ligth_positions,GTK_OBJECT(Win));
+diff -up GabeditSrc230/src/OpenGL/TriangleDraw.c.gtk GabeditSrc230/src/OpenGL/TriangleDraw.c
+--- GabeditSrc230/src/OpenGL/TriangleDraw.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/TriangleDraw.c	2010-08-27 00:15:32.000000000 +0200
+@@ -474,19 +474,19 @@ void set_opacity_dlg()
  
  	button = create_button(Win,_("OK"));
  	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
@@ -364,7 +2571,7 @@ diff -up GabeditSrc230/src/OpenGL/TriangleDraw.c.gtk GabeditSrc230/src/OpenGL/Tr
  	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
 diff -up GabeditSrc230/src/OpenGL/UtilsOrb.c.gtk GabeditSrc230/src/OpenGL/UtilsOrb.c
 --- GabeditSrc230/src/OpenGL/UtilsOrb.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/OpenGL/UtilsOrb.c	2010-08-26 23:50:26.000000000 +0200
++++ GabeditSrc230/src/OpenGL/UtilsOrb.c	2010-08-27 00:15:31.000000000 +0200
 @@ -1117,7 +1117,7 @@ void create_grid(gchar* title)
  	gtk_widget_realize(Win);
  
@@ -491,9 +2698,288 @@ diff -up GabeditSrc230/src/OpenGL/UtilsOrb.c.gtk GabeditSrc230/src/OpenGL/UtilsO
  	gtk_widget_grab_default(button);
  	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)applyColorMapOptions, GTK_OBJECT(dialogWindow));
  	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(dialogWindow));
+diff -up GabeditSrc230/src/OpenGL/Vibration.c.gtk GabeditSrc230/src/OpenGL/Vibration.c
+--- GabeditSrc230/src/OpenGL/Vibration.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/Vibration.c	2010-08-27 00:15:32.000000000 +0200
+@@ -644,7 +644,7 @@ static void  add_cancel_ok_button(GtkWid
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,_("Cancel"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+@@ -652,7 +652,7 @@ static void  add_cancel_ok_button(GtkWid
+ 
+ 	button = create_button(Win,_("OK"));
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)myFunc,GTK_OBJECT(Win));
+diff -up GabeditSrc230/src/Orca/Orca.c.gtk GabeditSrc230/src/Orca/Orca.c
+--- GabeditSrc230/src/Orca/Orca.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Orca/Orca.c	2010-08-27 00:15:31.000000000 +0200
+@@ -174,7 +174,7 @@ static void orcaInputFileWindow(gboolean
+ 	button = create_button(Wins,_("Cancel"));
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Wins,_("OK"));
+@@ -194,7 +194,7 @@ static void orcaInputFileWindow(gboolean
+ 
+ 
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins));
+diff -up GabeditSrc230/src/QChem/QChem.c.gtk GabeditSrc230/src/QChem/QChem.c
+--- GabeditSrc230/src/QChem/QChem.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/QChem/QChem.c	2010-08-27 00:15:33.000000000 +0200
+@@ -181,7 +181,7 @@ static void qchemInputFileWindow(gboolea
+ 	button = create_button(Wins,_("Cancel"));
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Wins,_("OK"));
+@@ -201,7 +201,7 @@ static void qchemInputFileWindow(gboolea
+ 
+ 
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins));
+diff -up GabeditSrc230/src/SemiEmpirical/SemiEmpiricalDlg.c.gtk GabeditSrc230/src/SemiEmpirical/SemiEmpiricalDlg.c
+--- GabeditSrc230/src/SemiEmpirical/SemiEmpiricalDlg.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/SemiEmpirical/SemiEmpiricalDlg.c	2010-08-27 00:15:30.000000000 +0200
+@@ -2400,13 +2400,13 @@ void semiEmpiricalDlg(gchar* type)
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,"Ok");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	if(!strcmp(type,"AM1FireFlyEnergy"))
+ 		g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)runAM1FireFlyEnergy,GTK_OBJECT(Win));
+@@ -5263,13 +5263,13 @@ void semiEmpiricalMolecularDynamicsDlg()
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,"Ok");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)semiEmpiricalMD,GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+@@ -5307,13 +5307,13 @@ void semiEmpiricalMolecularDynamicsConfo
+ 	gtk_widget_realize(Win);
+ 
+ 	button = create_button(Win,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+ 
+ 	button = create_button(Win,"Ok");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
+ 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)semiEmpiricalMDConfo,GTK_OBJECT(Win));
+ 	gtk_widget_show (button);
+diff -up GabeditSrc230/src/Spectrum/ECDSpectrum.c.gtk GabeditSrc230/src/Spectrum/ECDSpectrum.c
+--- GabeditSrc230/src/Spectrum/ECDSpectrum.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Spectrum/ECDSpectrum.c	2010-08-27 00:15:33.000000000 +0200
+@@ -680,14 +680,14 @@ static gboolean read_qchem_file_multiple
+ 	gtk_widget_show(hbox);
+ 
+ 	button = create_button(window,"Cancel");
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(window));
+ 	gtk_widget_show_all (button);
+ 
+ 	button = create_button(window,"OK");
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show_all (button);
+ 	g_object_set_data(G_OBJECT (button), "Window", window);
+diff -up GabeditSrc230/src/Spectrum/UVSpectrum.c.gtk GabeditSrc230/src/Spectrum/UVSpectrum.c
+--- GabeditSrc230/src/Spectrum/UVSpectrum.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Spectrum/UVSpectrum.c	2010-08-27 00:15:33.000000000 +0200
+@@ -703,14 +703,14 @@ static gboolean read_qchem_file_multiple
+ 	gtk_widget_show(hbox);
+ 
+ 	button = create_button(window,_("Cancel"));
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(window));
+ 	gtk_widget_show_all (button);
+ 
+ 	button = create_button(window,_("OK"));
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show_all (button);
+ 	g_object_set_data(G_OBJECT (button), "Window", window);
+diff -up GabeditSrc230/src/Symmetry/MoleculeSymmetryInterface.c.gtk GabeditSrc230/src/Symmetry/MoleculeSymmetryInterface.c
+--- GabeditSrc230/src/Symmetry/MoleculeSymmetryInterface.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Symmetry/MoleculeSymmetryInterface.c	2010-08-27 00:15:32.000000000 +0200
+@@ -210,7 +210,7 @@ void createGeometrySymmetryWindow(gint n
+ 	
+ 	Bouton = create_button(Dialogue,"OK");
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dialogue)->action_area), Bouton, FALSE, TRUE, 5);	
+-	GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Bouton, TRUE);
+ 	gtk_widget_grab_default(Bouton);
+ 	g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(Dialogue));
+ 	g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue));
+@@ -322,7 +322,7 @@ GtkWidget* createGeometryAbelianGroupWin
+ 	
+ 	Bouton = create_button(Dialogue,"OK");
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dialogue)->action_area), Bouton, FALSE, TRUE, 5);	
+-	GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Bouton, TRUE);
+ 	gtk_widget_grab_default(Bouton);
+ 	g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(Dialogue));
+ 	g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue));
+@@ -608,13 +608,13 @@ void createToleranceWindow(GtkWidget* wi
+ 
+ 	button = create_button(dialogWindow,"Cancel");
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5);	
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(dialogWindow));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(dialogWindow));
+ 
+ 	button = create_button(dialogWindow,"OK");
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5);	
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)setToleranceParametersFromTmp, GTK_OBJECT(dialogWindow));
+ 	if(myFunc) g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)myFunc, GTK_OBJECT(dialogWindow));
+diff -up GabeditSrc230/src/Utils/AtomsProp.c.gtk GabeditSrc230/src/Utils/AtomsProp.c
+--- GabeditSrc230/src/Utils/AtomsProp.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Utils/AtomsProp.c	2010-08-27 00:15:30.000000000 +0200
+@@ -1329,14 +1329,14 @@ static void dialog_set_atom_prop(GtkWidg
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)destroy_button_windows,GTK_OBJECT(Dialogue));
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+ 
+   Bouton = create_button(Dialogue,_("OK"));
+   gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0);
+   g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)set_atom_prop, sdata);
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)destroy_button_windows,GTK_OBJECT(Dialogue));
+   g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Dialogue));
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+     
+   add_button_windows(_(" Set properties "),Dialogue);
+@@ -1468,7 +1468,7 @@ void create_table_prop()
+   gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 2);
+   g_signal_connect_swapped(G_OBJECT(button),"clicked", (GCallback)destroy_button_windows, GTK_OBJECT(WinTable));
+   g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(WinTable));
+-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(button, TRUE);
+   gtk_widget_grab_default(button);
+   gtk_widget_show(button);
+   
+diff -up GabeditSrc230/src/Utils/ConvUtils.c.gtk GabeditSrc230/src/Utils/ConvUtils.c
+--- GabeditSrc230/src/Utils/ConvUtils.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Utils/ConvUtils.c	2010-08-27 00:15:30.000000000 +0200
+@@ -945,7 +945,7 @@ void create_conversion_dlg()
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dlg)->action_area), Button, FALSE, TRUE, 5);  
+ 	g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)destroy_dlg,GTK_OBJECT(Dlg));
+ 
+-	GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Button, TRUE);
+ 	gtk_widget_grab_default(Button);
+ 	gtk_widget_show_all(GTK_DIALOG(Dlg)->vbox);
+ 	gtk_widget_show_all(GTK_DIALOG(Dlg)->action_area);
 diff -up GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc230/src/Utils/GabeditContoursPlot.c
 --- GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Utils/GabeditContoursPlot.c	2010-08-26 22:17:15.000000000 +0200
++++ GabeditSrc230/src/Utils/GabeditContoursPlot.c	2010-08-27 00:15:30.000000000 +0200
+@@ -1758,14 +1758,14 @@ static void create_contours(GtkWidget* c
+ 	gtk_widget_realize(window);
+ 
+ 	button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(window));
+ 	gtk_widget_show (button);
+ 
+ 	button = gtk_button_new_from_stock(GTK_STOCK_OK);
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	gtk_widget_show (button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_contours,GTK_OBJECT(window));
+@@ -6205,17 +6205,17 @@ static void createColorMapOptionsWindow(
+ 
+ 	button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5);	
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(dialogWindow));
+ 
+ 	button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5);	
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)applyColorMapOptions, GTK_OBJECT(dialogWindow));
+ 
+ 	button = gtk_button_new_from_stock (GTK_STOCK_OK);
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5);	
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)applyColorMapOptions, GTK_OBJECT(dialogWindow));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(dialogWindow));
+@@ -7081,7 +7081,7 @@ static void gabedit_contoursplot_realize
+   g_return_if_fail (widget != NULL);
+   g_return_if_fail (GABEDIT_IS_ContoursPLOT (widget));
+ 
+-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
++  gtk_widget_set_can_default (widget, GTK_REALIZED);
+   contoursplot = GABEDIT_ContoursPLOT (widget);
+ 
+   attributes.x = widget->allocation.x;
 @@ -7501,7 +7501,7 @@ static void gabedit_contoursplot_size_al
    widget->allocation = *allocation;
    contoursplot=GABEDIT_ContoursPLOT(widget);  
@@ -521,9 +3007,27 @@ diff -up GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc230/src/Uti
    {
      contoursplot->plotting_area=gdk_pixmap_new(widget->window, contoursplot->plotting_rect.width, contoursplot->plotting_rect.height, -1);
      contoursplot->cairo_area = gdk_cairo_create (contoursplot->plotting_area);
+@@ -11147,7 +11147,7 @@ void gabedit_contoursplot_help()
+ 	gtk_box_set_homogeneous (GTK_BOX( GTK_DIALOG(dialog)->action_area), FALSE);
+ 	button = gtk_button_new_from_stock (GTK_STOCK_OK);
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(dialog)->action_area), button, FALSE, TRUE, 5);  
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",
+                           (GCallback)gtk_widget_destroy,
 diff -up GabeditSrc230/src/Utils/GabeditXYPlot.c.gtk GabeditSrc230/src/Utils/GabeditXYPlot.c
 --- GabeditSrc230/src/Utils/GabeditXYPlot.c.gtk	2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Utils/GabeditXYPlot.c	2010-08-26 22:17:15.000000000 +0200
++++ GabeditSrc230/src/Utils/GabeditXYPlot.c	2010-08-27 00:15:30.000000000 +0200
+@@ -6192,7 +6192,7 @@ static void gabedit_xyplot_realize (GtkW
+   g_return_if_fail (widget != NULL);
+   g_return_if_fail (GABEDIT_IS_XYPLOT (widget));
+ 
+-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
++  gtk_widget_set_can_default (widget, GTK_REALIZED);
+   xyplot = GABEDIT_XYPLOT (widget);
+ 
+   attributes.x = widget->allocation.x;
 @@ -6607,7 +6607,7 @@ static void gabedit_xyplot_size_allocate
    widget->allocation = *allocation;
    xyplot=GABEDIT_XYPLOT(widget);  
@@ -551,3 +3055,94 @@ diff -up GabeditSrc230/src/Utils/GabeditXYPlot.c.gtk GabeditSrc230/src/Utils/Gab
    {
      xyplot->plotting_area=gdk_pixmap_new(widget->window, xyplot->plotting_rect.width, xyplot->plotting_rect.height, -1);
      xyplot->cairo_area = gdk_cairo_create (xyplot->plotting_area);
+@@ -10109,7 +10109,7 @@ void gabedit_xyplot_help()
+ 	gtk_box_set_homogeneous (GTK_BOX( GTK_DIALOG(dialog)->action_area), FALSE);
+ 	button = gtk_button_new_from_stock (GTK_STOCK_OK);
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(dialog)->action_area), button, FALSE, TRUE, 5);  
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",
+                           (GCallback)gtk_widget_destroy,
+diff -up GabeditSrc230/src/Utils/PovrayUtils.c.gtk GabeditSrc230/src/Utils/PovrayUtils.c
+--- GabeditSrc230/src/Utils/PovrayUtils.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Utils/PovrayUtils.c	2010-08-27 00:15:30.000000000 +0200
+@@ -137,13 +137,13 @@ void createPovrayOptionsWindow(GtkWidget
+ 
+ 	button = create_button(dialogWindow,"Cancel");
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5);	
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(dialogWindow));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(dialogWindow));
+ 
+ 	button = create_button(dialogWindow,"OK");
+ 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5);	
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)applyPovrayOptions, GTK_OBJECT(dialogWindow));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(dialogWindow));
+diff -up GabeditSrc230/src/Utils/UtilsInterface.c.gtk GabeditSrc230/src/Utils/UtilsInterface.c
+--- GabeditSrc230/src/Utils/UtilsInterface.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Utils/UtilsInterface.c	2010-08-27 00:15:30.000000000 +0200
+@@ -639,7 +639,7 @@ GtkWidget* Message(char *message,char *t
+   
+   Bouton = create_button(DialogueMessage,_("OK"));
+   gtk_box_pack_end (GTK_BOX( GTK_DIALOG(DialogueMessage)->action_area), Bouton, FALSE, TRUE, 5);  
+-  GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++  gtk_widget_set_can_default(Bouton, TRUE);
+   gtk_widget_grab_default(Bouton);
+  g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",
+                           (GCallback)destroy_button_windows,
+@@ -687,7 +687,7 @@ GtkWidget* MessageTxt(gchar *message,gch
+   
+ 	button = create_button(dlgWin,_("OK"));
+ 	gtk_box_pack_end (GTK_BOX( GTK_DIALOG(dlgWin)->action_area), button, FALSE, TRUE, 5);  
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(dlgWin));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(dlgWin));
+@@ -779,12 +779,12 @@ void Cancel_YesNo(GtkWidget *widget, gpo
+     Bouton = create_button(DialogueMessage,_("No"));
+     gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0);
+     g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage));
+-    GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++    gtk_widget_set_can_default(Bouton, TRUE);
+     gtk_widget_grab_default(Bouton);
+ 
+     Bouton = create_button(DialogueMessage,_("Yes"));
+     gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0);
+-    GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++    gtk_widget_set_can_default(Bouton, TRUE);
+     g_signal_connect_swapped(G_OBJECT(Bouton),"clicked", (GCallback)func, GTK_OBJECT(widget));
+     g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage));
+ 
+@@ -2289,12 +2289,12 @@ GtkWidget *Continue_YesNo(void (*func)(G
+ 	Bouton = create_button(DialogueMessage,_("No"));
+ 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area),Bouton,TRUE,TRUE,0);
+ 	g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage));
+-	GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Bouton, TRUE);
+ 	gtk_widget_grab_default(Bouton);
+ 
+ 	Bouton = create_button(DialogueMessage,_("Yes"));
+ 	gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0);
+-	GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(Bouton, TRUE);
+ 	g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)func,data);
+ 	g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage));
+ 
+diff -up GabeditSrc230/src/VibrationalCorrections/GabeditGaussianInput.c.gtk GabeditSrc230/src/VibrationalCorrections/GabeditGaussianInput.c
+--- GabeditSrc230/src/VibrationalCorrections/GabeditGaussianInput.c.gtk	2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/VibrationalCorrections/GabeditGaussianInput.c	2010-08-27 00:15:30.000000000 +0200
+@@ -259,7 +259,7 @@ static GtkWidget* createResultWindow(gch
+ 
+ 	button = create_button(resultWindow,_("OK"));
+ 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 1);
+-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++	gtk_widget_set_can_default(button, TRUE);
+ 	gtk_widget_grab_default(button);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,G_OBJECT(resultWindow));
+ 	gtk_widget_show (button);


More information about the scm-commits mailing list