[gabedit/f14] updated to latest stable version (2.3.5) upstream switched from gtkglarea to gtkglext, adjust BRs

Dominik Mierzejewski rathann at fedoraproject.org
Tue Jul 19 18:34:35 UTC 2011


commit ea1e5dac96e2e38d9aba8f19e7b7cdde89d22e1b
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Tue Jul 19 20:34:19 2011 +0200

    updated to latest stable version (2.3.5)
    upstream switched from gtkglarea to gtkglext, adjust BRs

 .gitignore        |    1 +
 gabedit-gtk.patch | 4283 +++++++++++++++++++++++++++--------------------------
 gabedit-ld.patch  |   22 +-
 gabedit.spec      |   11 +-
 sources           |    2 +-
 5 files changed, 2189 insertions(+), 2130 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cccfe45..3d1e326 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 GabeditSrc230.tar.gz
+/GabeditSrc235.tar.gz
diff --git a/gabedit-gtk.patch b/gabedit-gtk.patch
index bb9b1d1..b99a9b2 100644
--- a/gabedit-gtk.patch
+++ b/gabedit-gtk.patch
@@ -1,7 +1,7 @@
-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 01:23:55.108292824 +0200
-@@ -170,13 +170,13 @@ void ExitDlg(GtkWidget* w, gpointer data
+diff -up GabeditSrc235/src/Common/Exit.c.gtk GabeditSrc235/src/Common/Exit.c
+--- GabeditSrc235/src/Common/Exit.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Common/Exit.c	2011-07-19 20:09:19.000000000 +0200
+@@ -173,13 +173,13 @@ void ExitDlg(GtkWidget* w, gpointer data
  
  
  	button = create_button(Win,"No");
@@ -17,9 +17,9 @@ diff -up GabeditSrc230/src/Common/Exit.c.gtk GabeditSrc230/src/Common/Exit.c
  	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-27 01:23:55.109292109 +0200
+diff -up GabeditSrc235/src/Common/Install.c.gtk GabeditSrc235/src/Common/Install.c
+--- GabeditSrc235/src/Common/Install.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Common/Install.c	2011-07-19 20:09:19.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));
@@ -36,10 +36,10 @@ diff -up GabeditSrc230/src/Common/Install.c.gtk GabeditSrc230/src/Common/Install
    gtk_widget_grab_default(button);
    continue_button = button;
    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-27 01:23:55.110292860 +0200
-@@ -2149,7 +2149,7 @@ void  create_execucte_commands(GtkWidget
+diff -up GabeditSrc235/src/Common/Preferences.c.gtk GabeditSrc235/src/Common/Preferences.c
+--- GabeditSrc235/src/Common/Preferences.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Common/Preferences.c	2011-07-19 20:12:29.000000000 +0200
+@@ -2159,7 +2159,7 @@ void  create_execucte_commands(GtkWidget
  	gtk_editable_set_editable((GtkEditable*)entry,TRUE);
  	gtk_widget_set_sensitive(entry, TRUE);
  	button = create_button_pixmap(Wins,open_xpm,NULL);
@@ -48,7 +48,7 @@ diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Pre
  	g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
                                       G_CALLBACK(set_entry_babel_selction),
                                       GTK_OBJECT(entry));
-@@ -2198,7 +2198,7 @@ void  create_gamess_directory(GtkWidget 
+@@ -2208,7 +2208,7 @@ void  create_gamess_directory(GtkWidget 
  	gtk_editable_set_editable((GtkEditable*)entry,FALSE);
  	gtk_widget_set_sensitive(entry, FALSE);
  	button = create_button_pixmap(Wins,open_xpm,NULL);
@@ -57,7 +57,7 @@ diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Pre
  	g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
                                       G_CALLBACK(set_entry_gamessDir_selection),
                                       GTK_OBJECT(entry));
-@@ -2242,7 +2242,7 @@ void  create_orca_directory(GtkWidget *W
+@@ -2252,7 +2252,7 @@ void  create_orca_directory(GtkWidget *W
  	gtk_editable_set_editable((GtkEditable*)entry,FALSE);
  	gtk_widget_set_sensitive(entry, FALSE);
  	button = create_button_pixmap(Wins,open_xpm,NULL);
@@ -66,7 +66,7 @@ diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Pre
  	g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
                                       G_CALLBACK(set_entry_orcaDir_selection),
                                       GTK_OBJECT(entry));
-@@ -2286,7 +2286,7 @@ void  create_firefly_directory(GtkWidget
+@@ -2296,7 +2296,7 @@ void  create_firefly_directory(GtkWidget
  	gtk_editable_set_editable((GtkEditable*)entry,FALSE);
  	gtk_widget_set_sensitive(entry, FALSE);
  	button = create_button_pixmap(Wins,open_xpm,NULL);
@@ -75,7 +75,7 @@ diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Pre
  	g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
                                       G_CALLBACK(set_entry_fireflyDir_selection),
                                       GTK_OBJECT(entry));
-@@ -2330,7 +2330,7 @@ void  create_mopac_directory(GtkWidget *
+@@ -2340,7 +2340,7 @@ void  create_mopac_directory(GtkWidget *
  	gtk_editable_set_editable((GtkEditable*)entry,FALSE);
  	gtk_widget_set_sensitive(entry, FALSE);
  	button = create_button_pixmap(Wins,open_xpm,NULL);
@@ -84,7 +84,7 @@ diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Pre
  	g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
                                       G_CALLBACK(set_entry_mopacDir_selection),
                                       GTK_OBJECT(entry));
-@@ -2372,7 +2372,7 @@ void  create_povray_directory(GtkWidget 
+@@ -2382,7 +2382,7 @@ void  create_povray_directory(GtkWidget 
  	gtk_editable_set_editable((GtkEditable*)entry,FALSE);
  	gtk_widget_set_sensitive(entry, FALSE);
  	button = create_button_pixmap(Wins,open_xpm,NULL);
@@ -93,7 +93,7 @@ diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Pre
  	g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
                                       G_CALLBACK(set_entry_povrayDir_selection),
                                       GTK_OBJECT(entry));
-@@ -2414,7 +2414,7 @@ void  create_gauss_directory(GtkWidget *
+@@ -2424,7 +2424,7 @@ void  create_gauss_directory(GtkWidget *
  	gtk_editable_set_editable((GtkEditable*)entry,FALSE);
  	gtk_widget_set_sensitive(entry, FALSE);
  	button = create_button_pixmap(Wins,open_xpm,NULL);
@@ -102,7 +102,7 @@ diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Pre
  	g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
                                       G_CALLBACK(set_entry_gaussDir_selection),
                                       GTK_OBJECT(entry));
-@@ -2557,7 +2557,7 @@ void  create_pscpplink_directory(GtkWidg
+@@ -2567,7 +2567,7 @@ void  create_pscpplink_directory(GtkWidg
  	gtk_editable_set_editable((GtkEditable*)entry,FALSE);
  	gtk_widget_set_sensitive(entry, FALSE);
  	button = create_button_pixmap(Wins,open_xpm,NULL);
@@ -111,7 +111,7 @@ diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Pre
  	g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
                                       G_CALLBACK(set_entry_pscpplinkDir_selection),
                                       GTK_OBJECT(entry));
-@@ -2774,13 +2774,13 @@ void create_preferences()
+@@ -2784,13 +2784,13 @@ void create_preferences()
    gtk_widget_realize(Wins);
  
    button = create_button(Wins,"Close");
@@ -127,7 +127,7 @@ diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Pre
    gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0);
    g_signal_connect(G_OBJECT(button), "clicked",G_CALLBACK(apply_all),NULL);
    g_signal_connect(G_OBJECT(button), "clicked",G_CALLBACK(create_ressource_file),NULL);
-@@ -2789,7 +2789,7 @@ void create_preferences()
+@@ -2799,7 +2799,7 @@ void create_preferences()
    gtk_widget_show_all (button);
  
    button = create_button(Wins,_("Apply&Close"));
@@ -136,7 +136,7 @@ diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Pre
    gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0);
    g_signal_connect(G_OBJECT(button), "clicked",G_CALLBACK(apply_all),NULL);
    g_signal_connect_swapped(GTK_OBJECT(button), "clicked",(GCallback)destroy_preferences_window,GTK_OBJECT(Wins));
-@@ -2797,7 +2797,7 @@ void create_preferences()
+@@ -2807,7 +2807,7 @@ void create_preferences()
    gtk_widget_show_all (button);
  
    button = create_button(Wins,_("Apply"));
@@ -145,9 +145,54 @@ diff -up GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Pre
    gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0);
    g_signal_connect(G_OBJECT(button), "clicked",G_CALLBACK(apply_all),NULL);
    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-27 01:23:55.111290679 +0200
+@@ -3058,19 +3058,19 @@ void set_opacity_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_opacity_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_opacity,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));
+@@ -3251,18 +3251,18 @@ void createColorMapOptionsWindow(GtkWidg
+ 
+ 	button = create_button(dialogWindow,_("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)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,_("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 = 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)applyColorMapOptions, GTK_OBJECT(dialogWindow));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(dialogWindow));
+diff -up GabeditSrc235/src/Common/Printer.c.gtk GabeditSrc235/src/Common/Printer.c
+--- GabeditSrc235/src/Common/Printer.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Common/Printer.c	2011-07-19 20:09:19.000000000 +0200
 @@ -399,20 +399,20 @@ void create_print_page()
    FrameOptions = NULL;
  
@@ -172,9 +217,9 @@ 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 01:42:23.723295398 +0200
+diff -up GabeditSrc235/src/Common/Run.c.gtk GabeditSrc235/src/Common/Run.c
+--- GabeditSrc235/src/Common/Run.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Common/Run.c	2011-07-19 20:09:19.000000000 +0200
 @@ -98,9 +98,6 @@ void set_frame_remote_visibility(GtkWidg
  	gint* type = NULL;
  
@@ -249,9 +294,9 @@ diff -up GabeditSrc230/src/Common/Run.c.gtk GabeditSrc230/src/Common/Run.c
    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-27 01:23:55.115291241 +0200
+diff -up GabeditSrc235/src/Common/SplashScreen.c.gtk GabeditSrc235/src/Common/SplashScreen.c
+--- GabeditSrc235/src/Common/SplashScreen.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Common/SplashScreen.c	2011-07-19 20:09:19.000000000 +0200
 @@ -352,7 +352,7 @@ static gint expose_event(GtkWidget  *wid
    	pixmap = (GdkPixmap *)g_object_get_data(G_OBJECT(widget), "Pixmap");
  	if(pixmap)
@@ -261,1519 +306,1912 @@ diff -up GabeditSrc230/src/Common/SplashScreen.c.gtk GabeditSrc230/src/Common/Sp
                    pixmap,
                    event->area.x, event->area.y,
                    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-27 01:23:55.116291504 +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);
-     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);
- 
-     /* the No button */
-     Bouton = create_button(DialogueMessage,_("No"));
-     gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0);
-     g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)ExitDlg,NULL);
--    GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
-+    gtk_widget_set_can_default(Bouton, TRUE);
-     g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage));
- 
-     /* the Yes button */
-@@ -502,7 +502,7 @@ void Save_YesNo()
-     gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0);
-     g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)choose_file_to_save_end,NULL);
-     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);
- 
- 
- 
-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 01:23:55.117291767 +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);
+diff -up GabeditSrc235/src/Display/AnimationGeomConv.c.gtk GabeditSrc235/src/Display/AnimationGeomConv.c
+--- GabeditSrc235/src/Display/AnimationGeomConv.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/AnimationGeomConv.c	2011-07-19 20:09:19.000000000 +0200
+@@ -4756,7 +4756,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);
- 	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);
+ 	g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
+                                      G_CALLBACK(set_entry_inputGaussDir_selection),
+                                      GTK_OBJECT(entry));
+@@ -4829,7 +4829,7 @@ static void  add_cancel_ok_button(GtkWid
+ 	gtk_widget_realize(Win);
  
- 	button = create_button(fp,_("Cancel"));
+ 	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_children,GTK_OBJECT(fp));
- 	gtk_widget_show (button);
+ 	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));
+@@ -4837,7 +4837,7 @@ static void  add_cancel_ok_button(GtkWid
  
- 	button = create_button(fp,"OK");
+ 	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(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 01:23:55.117291767 +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));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)myFunc,GTK_OBJECT(Win));
+diff -up GabeditSrc235/src/Display/AnimationMD.c.gtk GabeditSrc235/src/Display/AnimationMD.c
+--- GabeditSrc235/src/Display/AnimationMD.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/AnimationMD.c	2011-07-19 20:09:19.000000000 +0200
+@@ -2065,7 +2065,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);
- 	gtk_widget_show (button);
- 
- 	button = create_button(Wins,_("OK"));
-@@ -223,7 +223,7 @@ static void fireflyInputFileWindow(gbool
+ 	g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
+                                      G_CALLBACK(set_entry_inputGaussDir_selection),
+                                      GTK_OBJECT(entry));
+@@ -2138,7 +2138,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));
+@@ -2146,7 +2146,7 @@ void  add_cancel_ok_button(GtkWidget *Wi
  
- 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+ 	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",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 01:23:55.118291052 +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));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)myFunc,GTK_OBJECT(Win));
+diff -up GabeditSrc235/src/Display/CaptureOrbitals.c.gtk GabeditSrc235/src/Display/CaptureOrbitals.c
+--- GabeditSrc235/src/Display/CaptureOrbitals.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/CaptureOrbitals.c	2011-07-19 20:09:19.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(Wins,_("OK"));
-@@ -206,7 +206,7 @@ static void gamessInputFileWindow(gboole
+ 	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()
  
- 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+ 	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",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 01:23:55.118291052 +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));
+ 	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 GabeditSrc235/src/Display/ColorMap.c.gtk GabeditSrc235/src/Display/ColorMap.c
+--- GabeditSrc235/src/Display/ColorMap.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/ColorMap.c	2011-07-19 20:09:19.000000000 +0200
+@@ -644,7 +644,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 GabeditSrc235/src/Display/Contours.c.gtk GabeditSrc235/src/Display/Contours.c
+--- GabeditSrc235/src/Display/Contours.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/Contours.c	2011-07-19 20:09:19.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_widget_show (button);
+   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(Wins,"OK");
-   gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);  
+   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)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);
+   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);
  
-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-27 01:23:55.119287403 +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);
-   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);
+   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
  
-   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)EditBasisC, 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);
+   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);
  
-   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);
+   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);
  
-   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 01:23:55.119287403 +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);
+   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 GabeditSrc235/src/Display/Dipole.c.gtk GabeditSrc235/src/Display/Dipole.c
+--- GabeditSrc235/src/Display/Dipole.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/Dipole.c	2011-07-19 20:09:19.000000000 +0200
+@@ -142,7 +142,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 GabeditSrc235/src/Display/GLArea.c.gtk GabeditSrc235/src/Display/GLArea.c
+--- GabeditSrc235/src/Display/GLArea.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/GLArea.c	2011-07-19 20:09:19.000000000 +0200
+@@ -773,7 +773,7 @@ gint init(GtkWidget *widget)
+ 	GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (widget);
+ 	
+ 	if(!GTK_IS_WIDGET(widget)) return TRUE;
+-	if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
++	if(!gtk_widget_get_realized(widget)) return TRUE;
  
-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 01:23:55.120290600 +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);
+ 	if (gdk_gl_drawable_gl_begin (gldrawable, glcontext))
+ 	{
+@@ -1024,7 +1024,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;
  
-   /* 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 01:23:55.120290600 +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));
+     	glMatrixMode(GL_PROJECTION);
+     	glLoadIdentity();
+@@ -1085,7 +1085,7 @@ static gint redraw(GtkWidget *widget, gp
+ 	GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (widget);
+ 	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;
  
--  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 01:23:55.121290862 +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));
+ 	if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext)) return FALSE;
  
--  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 01:23:55.122291125 +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));
+@@ -1155,7 +1155,7 @@ static gint draw(GtkWidget *widget, GdkE
+ 	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;
  
--  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 01:23:55.122291125 +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);
+@@ -1172,7 +1172,7 @@ static gint reshape(GtkWidget *widget, G
+ 	GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (widget);
  
-   /* 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);
+ 	if(!GTK_IS_WIDGET(widget)) return TRUE;
+-	if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
++	if(!gtk_widget_get_realized(widget)) return TRUE;
  
-   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 01:23:55.122291125 +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);
+ 	if (gdk_gl_drawable_gl_begin (gldrawable, glcontext))
+ 	{
+diff -up GabeditSrc235/src/Display/GridAdfOrbitals.c.gtk GabeditSrc235/src/Display/GridAdfOrbitals.c
+--- GabeditSrc235/src/Display/GridAdfOrbitals.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/GridAdfOrbitals.c	2011-07-19 20:09:19.000000000 +0200
+@@ -422,7 +422,7 @@ static void create_list_adf_orbitals()
+   gtk_widget_realize(Win);
  
-   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-27 01:23:55.126290221 +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));
+   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 GabeditSrc235/src/Display/GridCP.c.gtk GabeditSrc235/src/Display/GridCP.c
+--- GabeditSrc235/src/Display/GridCP.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/GridCP.c	2011-07-19 20:09:19.000000000 +0200
+@@ -1235,13 +1235,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(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));
+ 	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));
  
-@@ -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));
+diff -up GabeditSrc235/src/Display/GridCube.c.gtk GabeditSrc235/src/Display/GridCube.c
+--- GabeditSrc235/src/Display/GridCube.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/GridCube.c	2011-07-19 20:09:19.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(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));
+ 	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));
+@@ -1508,14 +1508,14 @@ static void create_window_list_orbitals_
+   gtk_widget_realize(fp);
  
-@@ -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));
+   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 GabeditSrc235/src/Display/GridMolcas.c.gtk GabeditSrc235/src/Display/GridMolcas.c
+--- GabeditSrc235/src/Display/GridMolcas.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/GridMolcas.c	2011-07-19 20:09:19.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 GabeditSrc235/src/Display/GridPlans.c.gtk GabeditSrc235/src/Display/GridPlans.c
+--- GabeditSrc235/src/Display/GridPlans.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/GridPlans.c	2011-07-19 20:09:19.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 GabeditSrc235/src/Display/GridQChem.c.gtk GabeditSrc235/src/Display/GridQChem.c
+--- GabeditSrc235/src/Display/GridQChem.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/GridQChem.c	2011-07-19 20:09:19.000000000 +0200
+@@ -473,14 +473,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(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));
+ 	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 GabeditSrc235/src/Display/IntegralOrbitals.c.gtk GabeditSrc235/src/Display/IntegralOrbitals.c
+--- GabeditSrc235/src/Display/IntegralOrbitals.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/IntegralOrbitals.c	2011-07-19 20:09:19.000000000 +0200
+@@ -1336,13 +1336,13 @@ void coulomb_orbitals_dlg()
  
-@@ -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));
+ 	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(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));
+ 	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));
+@@ -1918,13 +1918,13 @@ void transition_matrix_orbitals_dlg()
  
- 	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));
+ 	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));
  
-@@ -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));
+ 	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));
+@@ -2399,13 +2399,13 @@ void spatial_overlap_orbitals_dlg()
  
- 	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));
+ 	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));
  
-@@ -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));
+ 	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 GabeditSrc235/src/Display/LabelsGL.c.gtk GabeditSrc235/src/Display/LabelsGL.c
+--- GabeditSrc235/src/Display/LabelsGL.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/LabelsGL.c	2011-07-19 20:09:19.000000000 +0200
+@@ -731,19 +731,19 @@ void set_title_dlg()
  
- 	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));
+ 	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));
  
-@@ -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));
+ 	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(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));
+ 	button = create_button(Win,_("Cancel"));
 -	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 +	gtk_widget_set_can_default(button, TRUE);
- 	gtk_widget_grab_default(button);
-     
+ 	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 GabeditSrc235/src/Display/Orbitals.c.gtk GabeditSrc235/src/Display/Orbitals.c
+--- GabeditSrc235/src/Display/Orbitals.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/Orbitals.c	2011-07-19 20:09:19.000000000 +0200
+@@ -466,7 +466,7 @@ static void cut_ceof_orbitals_win(GtkWid
+ 	gtk_widget_realize(Win);
  
-@@ -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));
+ 	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(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));
+ 	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);
-     
- 
-@@ -6841,7 +6841,7 @@ gint motion_notify(GtkWidget *widget, Gd
- static void redraw()
- {
-   gdk_draw_drawable(ZoneDessin->window,
--                  ZoneDessin->style->fg_gc[GTK_WIDGET_STATE (ZoneDessin)],
-+                  ZoneDessin->style->fg_gc[gtk_widget_get_state(ZoneDessin)],
-                   pixmap,
-                   0,0,
-                   0,0,
-@@ -6890,7 +6890,7 @@ static gint expose_event( GtkWidget *wid
- {
- 	if(event->count >0) return FALSE;
- 	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/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-27 01:23:55.127291950 +0200
-@@ -156,7 +156,7 @@ static gint expose_event (GtkWidget *wid
- {
- 	GdkPixmap *pixmap = (GdkPixmap*)(g_object_get_data(G_OBJECT(widget),"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,
-@@ -181,7 +181,7 @@ void set_point(GtkWidget *widget, gint x
- 	
- 
- 	  gdk_draw_drawable(widget->window,
--                  widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-+                  widget->style->fg_gc[gtk_widget_get_state(widget)],
-                   pixmap,
-                   0,0,
-                   0,0,
-@@ -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);
- 
- 	/*
- 	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);
- 	*/
- 
- 	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);
- 
- 	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 01:23:55.131290557 +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);
-     
- 
-   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 (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);
  
-   gtk_widget_show_all(Dialogue);
-@@ -11304,7 +11304,7 @@ void create_window_save_xyzmol2tinkerpdb
+   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(fp,_("OK"));
-   gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 3);
+   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",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);
+   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()
  
- 
-   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 01:23:55.134290857 +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));
+   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 GabeditSrc235/src/Display/OrbitalsMolpro.c.gtk GabeditSrc235/src/Display/OrbitalsMolpro.c
+--- GabeditSrc235/src/Display/OrbitalsMolpro.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/OrbitalsMolpro.c	2011-07-19 20:09:19.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_end (GTK_BOX( hbox), button, FALSE, FALSE, 3);
+   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_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);
+   g_object_set_data(G_OBJECT (button), "Window", fp);
+diff -up GabeditSrc235/src/Display/PlanesMapped.c.gtk GabeditSrc235/src/Display/PlanesMapped.c
+--- GabeditSrc235/src/Display/PlanesMapped.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/PlanesMapped.c	2011-07-19 20:09:19.000000000 +0200
+@@ -173,7 +173,7 @@ void create_maps(gchar* title,gint type)
+   gtk_widget_realize(Win);
  
-   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);
-     
+   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)
  
-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 01:23:55.134290857 +0200
-@@ -701,7 +701,7 @@ void create_babel_dialogue()
+   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 GabeditSrc235/src/Display/PovrayGL.c.gtk GabeditSrc235/src/Display/PovrayGL.c
+--- GabeditSrc235/src/Display/PovrayGL.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/PovrayGL.c	2011-07-19 20:09:19.000000000 +0200
+@@ -1870,19 +1870,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_widget_grab_default(button);
+ 	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);
  
-@@ -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);
- 
+ 	button = create_button(Win,"Save");
 -	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 +	gtk_widget_set_can_default(button, TRUE);
- 	gtk_widget_grab_default(button);
+ 	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(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));
+ 	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 GabeditSrc235/src/Display/PreferencesOrb.c.gtk GabeditSrc235/src/Display/PreferencesOrb.c
+--- GabeditSrc235/src/Display/PreferencesOrb.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/PreferencesOrb.c	2011-07-19 20:09:19.000000000 +0200
+@@ -150,14 +150,14 @@ void set_colors_surfaces(gchar* title)
+   gtk_widget_realize(Win);
  
- 	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 01:23:55.135291609 +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);
-     
+   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);
  
-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 01:23:55.136290894 +0200
-@@ -1262,19 +1262,19 @@ void exportPOVGeomDlg(GtkWidget *parentW
+   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));
+@@ -506,20 +506,20 @@ void set_camera()
  	gtk_widget_realize(Win);
  
- 	button = create_button(Win,"Cancel");
+ 	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( 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_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,"Save");
+ 	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( 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);
+ 	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,"Run PovRay");
+ 	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_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_grab_default(button);
  	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 01:23:55.137292623 +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 01:23:55.138292886 +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);
+@@ -562,14 +562,14 @@ void set_light_positions(gchar* title)
+   gtk_widget_realize(Win);
  
-   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);
+   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);
  
-   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);
+   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 GabeditSrc235/src/Display/UtilsOrb.c.gtk GabeditSrc235/src/Display/UtilsOrb.c
+--- GabeditSrc235/src/Display/UtilsOrb.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/UtilsOrb.c	2011-07-19 20:09:19.000000000 +0200
+@@ -1098,7 +1098,7 @@ void create_grid(gchar* title)
+ 	gtk_widget_realize(Win);
  
-@@ -2686,7 +2686,7 @@ void create_bar_result(GtkWidget* Vbox)
-   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)get_file_frome_remote_host,&out);
+ 	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, G_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
+@@ -1106,7 +1106,7 @@ void create_grid(gchar* title)
  
-   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);
+ 	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)applygrid,G_OBJECT(Win));
+@@ -1313,7 +1313,7 @@ void create_grid_ELF_Dens_analyze(gboole
+ 	gtk_widget_realize(Win);
  
-@@ -2694,7 +2694,7 @@ void create_bar_result(GtkWidget* Vbox)
-   g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)get_file_frome_remote_host,&mol);
+ 	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, G_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
+@@ -1321,7 +1321,7 @@ void create_grid_ELF_Dens_analyze(gboole
  
-   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 01:23:55.138292886 +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 01:23:55.139291193 +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));
+ 	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);
- 	/*
- 	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);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)applyelfdens,G_OBJECT(Win));
+@@ -1989,7 +1989,7 @@ void create_grid_sas(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, G_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
+@@ -1997,7 +1997,7 @@ void create_grid_sas(gchar* title)
+ 
+ 	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",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 01:23:55.139291193 +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);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)applygridsas,G_OBJECT(Win));
+@@ -2115,19 +2115,19 @@ void set_scale_ball_stick_dlg()
  
- 	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(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_scale_ball_stick_close,G_OBJECT(Win));
  
- 	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);
-     
+ 	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_scale_ball_stick,G_OBJECT(Win));
  
-@@ -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(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));
+@@ -2159,7 +2159,7 @@ static void resetGridColorMap()
+ 			g_object_set_data(G_OBJECT(entryRight),"ColorMap", colorMap);
+ 			g_object_set_data(G_OBJECT(darea),"ColorMap", colorMap);
+ 			color_map_refresh(handleBoxColorMapGrid);
+-			if(GTK_WIDGET_VISIBLE(handleBoxColorMapGrid))
++			if(gtk_widget_get_visible(handleBoxColorMapGrid))
+ 			{
+ 				gtk_widget_hide(handleBoxColorMapGrid);
+ 				gtk_widget_show(handleBoxColorMapGrid);
+@@ -2190,7 +2190,7 @@ static void resetPlanesMappedColorMap()
+ 			g_object_set_data(G_OBJECT(entryRight),"ColorMap", colorMap);
+ 			g_object_set_data(G_OBJECT(darea),"ColorMap", colorMap);
+ 			color_map_refresh(handleBoxColorMapPlanesMapped);
+-			if(GTK_WIDGET_VISIBLE(handleBoxColorMapPlanesMapped))
++			if(gtk_widget_get_visible(handleBoxColorMapPlanesMapped))
+ 			{
+ 				gtk_widget_hide(handleBoxColorMapPlanesMapped);
+ 				gtk_widget_show(handleBoxColorMapPlanesMapped);
+@@ -2223,7 +2223,7 @@ static void resetContoursColorMap()
+ 			g_object_set_data(G_OBJECT(entryRight),"ColorMap", colorMap);
+ 			g_object_set_data(G_OBJECT(darea),"ColorMap", colorMap);
+ 			color_map_refresh(handleBoxColorMapContours);
+-			if(GTK_WIDGET_VISIBLE(handleBoxColorMapContours))
++			if(gtk_widget_get_visible(handleBoxColorMapContours))
+ 			{
+ 				gtk_widget_hide(handleBoxColorMapContours);
+ 				gtk_widget_show(handleBoxColorMapContours);
+diff -up GabeditSrc235/src/Display/Vibration.c.gtk GabeditSrc235/src/Display/Vibration.c
+--- GabeditSrc235/src/Display/Vibration.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Display/Vibration.c	2011-07-19 20:09:19.000000000 +0200
+@@ -644,7 +644,7 @@ static void  add_cancel_ok_button(GtkWid
+ 	gtk_widget_realize(Win);
  
- 	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);
-     
+ 	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
  
-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 01:23:55.140291456 +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));
+ 	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 GabeditSrc235/src/Files/FileChooser.c.gtk GabeditSrc235/src/Files/FileChooser.c
+--- GabeditSrc235/src/Files/FileChooser.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Files/FileChooser.c	2011-07-19 20:09:19.000000000 +0200
+@@ -491,14 +491,14 @@ void Save_YesNo()
+     Bouton = create_button(DialogueMessage,_("Cancel"));
+     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);
  
+     /* the No button */
+     Bouton = create_button(DialogueMessage,_("No"));
+     gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0);
+     g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)ExitDlg,NULL);
+-    GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++    gtk_widget_set_can_default(Bouton, TRUE);
+     g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage));
  
-@@ -213,7 +213,7 @@ static void molcasInputFileWindow(gboole
- 	createScfFrame(Wins, hbox, button);
+     /* the Yes button */
+@@ -506,7 +506,7 @@ void Save_YesNo()
+     gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0);
+     g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)choose_file_to_save_end,NULL);
+     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_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+ 
+ 
+diff -up GabeditSrc235/src/Files/ListeFiles.c.gtk GabeditSrc235/src/Files/ListeFiles.c
+--- GabeditSrc235/src/Files/ListeFiles.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Files/ListeFiles.c	2011-07-19 20:09:19.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);
- 	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 01:23:55.141291719 +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 01:23:55.142293937 +0200
-@@ -3917,13 +3917,13 @@ void MolecularMechanicsEnergyDlg()
- 	gtk_widget_realize(Win);
+ 	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(Win,"Cancel");
+ 	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( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0);
- 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(DestroyWinMMDlg),GTK_OBJECT(Win));
+ 	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(Win,"Ok");
+ 	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_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_grab_default(button);
  	gtk_widget_show (button);
-@@ -3960,13 +3960,13 @@ void MolecularMechanicsMinimizeDlg()
- 	gtk_widget_realize(Win);
+ 	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));
  
- 	button = create_button(Win,"Cancel");
+     /* 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 GabeditSrc235/src/FireFly/FireFly.c.gtk GabeditSrc235/src/FireFly/FireFly.c
+--- GabeditSrc235/src/FireFly/FireFly.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/FireFly/FireFly.c	2011-07-19 20:09:19.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_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");
+ 	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_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_grab_default(button);
  	gtk_widget_show (button);
-@@ -4006,13 +4006,13 @@ void MolecularMechanicsDynamicsDlg()
- 	gtk_widget_realize(Win);
- 
- 	button = create_button(Win,"Cancel");
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins));
+diff -up GabeditSrc235/src/Gamess/Gamess.c.gtk GabeditSrc235/src/Gamess/Gamess.c
+--- GabeditSrc235/src/Gamess/Gamess.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Gamess/Gamess.c	2011-07-19 20:09:19.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_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");
+ 	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_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_grab_default(button);
  	gtk_widget_show (button);
-@@ -4051,13 +4051,13 @@ void MolecularMechanicsDynamicsConfoDlg(
- 	gtk_widget_realize(Win);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins));
+diff -up GabeditSrc235/src/Gaussian/Gaussian.c.gtk GabeditSrc235/src/Gaussian/Gaussian.c
+--- GabeditSrc235/src/Gaussian/Gaussian.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Gaussian/Gaussian.c	2011-07-19 20:09:19.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(Win,"Cancel");
+   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(Win)->action_area), button, TRUE, TRUE, 0);
- 	g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win));
+ 	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(Win,"Ok");
+@@ -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_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_grab_default(button);
  	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 01:23:55.144292018 +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);
  
+diff -up GabeditSrc235/src/Gaussian/GInterfaceBasis.c.gtk GabeditSrc235/src/Gaussian/GInterfaceBasis.c
+--- GabeditSrc235/src/Gaussian/GInterfaceBasis.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Gaussian/GInterfaceBasis.c	2011-07-19 20:09:19.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);
+   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);
  
- 	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);
+   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)EditBasisC, 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);
+@@ -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 GabeditSrc235/src/Geometry/BuildLinear.c.gtk GabeditSrc235/src/Geometry/BuildLinear.c
+--- GabeditSrc235/src/Geometry/BuildLinear.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/BuildLinear.c	2011-07-19 20:09:19.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 GabeditSrc235/src/Geometry/BuildNanoTube.c.gtk GabeditSrc235/src/Geometry/BuildNanoTube.c
+--- GabeditSrc235/src/Geometry/BuildNanoTube.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/BuildNanoTube.c	2011-07-19 20:09:19.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 GabeditSrc235/src/Geometry/BuildPolyNucleicAcid.c.gtk GabeditSrc235/src/Geometry/BuildPolyNucleicAcid.c
+--- GabeditSrc235/src/Geometry/BuildPolyNucleicAcid.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/BuildPolyNucleicAcid.c	2011-07-19 20:09:19.000000000 +0200
+@@ -2472,7 +2472,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 GabeditSrc235/src/Geometry/BuildPolyPeptide.c.gtk GabeditSrc235/src/Geometry/BuildPolyPeptide.c
+--- GabeditSrc235/src/Geometry/BuildPolyPeptide.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/BuildPolyPeptide.c	2011-07-19 20:09:19.000000000 +0200
+@@ -1562,7 +1562,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 GabeditSrc235/src/Geometry/BuildPolySaccharide.c.gtk GabeditSrc235/src/Geometry/BuildPolySaccharide.c
+--- GabeditSrc235/src/Geometry/BuildPolySaccharide.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/BuildPolySaccharide.c	2011-07-19 20:09:19.000000000 +0200
+@@ -929,7 +929,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 GabeditSrc235/src/Geometry/BuildRing.c.gtk GabeditSrc235/src/Geometry/BuildRing.c
+--- GabeditSrc235/src/Geometry/BuildRing.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/BuildRing.c	2011-07-19 20:09:19.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 GabeditSrc235/src/Geometry/BuildRoZPhi.c.gtk GabeditSrc235/src/Geometry/BuildRoZPhi.c
+--- GabeditSrc235/src/Geometry/BuildRoZPhi.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/BuildRoZPhi.c	2011-07-19 20:09:19.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 GabeditSrc235/src/Geometry/DrawGeomCairo.c.gtk GabeditSrc235/src/Geometry/DrawGeomCairo.c
+--- GabeditSrc235/src/Geometry/DrawGeomCairo.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/DrawGeomCairo.c	2011-07-19 20:21:30.000000000 +0200
+@@ -2834,13 +2834,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);
+     
+ 
+@@ -2933,13 +2933,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);
+     
+ 
+@@ -3057,13 +3057,13 @@ void setResidueNameOfselectedAtomsDlg()
+ 	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)setResidueNameOfselectedAtoms,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);
+     
+ 
+@@ -3193,13 +3193,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);
+     
+ 
+@@ -3273,13 +3273,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);
+     
+ 
+@@ -6144,7 +6144,7 @@ gint motion_notify(GtkWidget *widget, Gd
+ static void redraw()
+ {
+   gdk_draw_drawable(GeomDrawingArea->window,
+-                  GeomDrawingArea->style->fg_gc[GTK_WIDGET_STATE (GeomDrawingArea)],
++                  GeomDrawingArea->style->fg_gc[gtk_widget_get_state(GeomDrawingArea)],
+                   pixmap,
+                   0,0,
+                   0,0,
+@@ -6193,7 +6193,7 @@ static gint expose_event( GtkWidget *wid
+ {
+ 	if(event->count >0) return FALSE;
+ 	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 GabeditSrc235/src/Geometry/EnergiesCurves.c.gtk GabeditSrc235/src/Geometry/EnergiesCurves.c
+--- GabeditSrc235/src/Geometry/EnergiesCurves.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/EnergiesCurves.c	2011-07-19 20:09:19.000000000 +0200
+@@ -156,7 +156,7 @@ static gint expose_event (GtkWidget *wid
+ {
+ 	GdkPixmap *pixmap = (GdkPixmap*)(g_object_get_data(G_OBJECT(widget),"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,
+@@ -181,7 +181,7 @@ void set_point(GtkWidget *widget, gint x
+ 	
+ 
+ 	  gdk_draw_drawable(widget->window,
+-                  widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++                  widget->style->fg_gc[gtk_widget_get_state(widget)],
+                   pixmap,
+                   0,0,
+                   0,0,
+@@ -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);
+ 
+ 	/*
+ 	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);
+ 	*/
+ 
+ 	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);
+ 
+ 	g_object_set_data(G_OBJECT (dessin), "Geometry", GeomConv);
+ 	
+diff -up GabeditSrc235/src/Geometry/GeomXYZ.c.gtk GabeditSrc235/src/Geometry/GeomXYZ.c
+--- GabeditSrc235/src/Geometry/GeomXYZ.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/GeomXYZ.c	2011-07-19 20:14:26.000000000 +0200
+@@ -2226,14 +2226,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);
+     
+ 
+   gtk_widget_show_all(Dialogue);
+@@ -2282,14 +2282,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);
+@@ -2879,13 +2879,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);
+     
+ 
+@@ -3044,13 +3044,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);
+     
+ 
+@@ -3101,14 +3101,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);
+@@ -11907,7 +11907,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));
+@@ -11917,7 +11917,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);
+@@ -12185,14 +12185,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);
+@@ -12252,13 +12252,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);
+     
+ 
+@@ -12358,13 +12358,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 GabeditSrc235/src/Geometry/GeomZmatrix.c.gtk GabeditSrc235/src/Geometry/GeomZmatrix.c
+--- GabeditSrc235/src/Geometry/GeomZmatrix.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/GeomZmatrix.c	2011-07-19 20:14:56.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);
  
- 	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);
+   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 GabeditSrc235/src/Geometry/OpenBabel.c.gtk GabeditSrc235/src/Geometry/OpenBabel.c
+--- GabeditSrc235/src/Geometry/OpenBabel.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/OpenBabel.c	2011-07-19 20:09:19.000000000 +0200
+@@ -701,7 +701,7 @@ void create_babel_dialogue()
  
  
-@@ -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);
+ 	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 GabeditSrc235/src/Geometry/PersonalFragments.c.gtk GabeditSrc235/src/Geometry/PersonalFragments.c
+--- GabeditSrc235/src/Geometry/PersonalFragments.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/PersonalFragments.c	2011-07-19 20:09:19.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(G_OBJECT(Button), "clicked",(GCallback)f,NULL);
- 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+ 	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);
- 	  
- 	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));
+     
+ 
+@@ -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");
+ 	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));
+ 	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);
- 	  
- 	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));
+     
+ 
+@@ -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(G_OBJECT(Button), "clicked",(GCallback)f,NULL);
- 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+ 	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);
- 	  
- 	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));
+     
+ 
+@@ -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(G_OBJECT(Button), "clicked",(GCallback)f,NULL);
- 	g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg));
+ 	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 GabeditSrc235/src/Geometry/Povray.c.gtk GabeditSrc235/src/Geometry/Povray.c
+--- GabeditSrc235/src/Geometry/Povray.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/Povray.c	2011-07-19 20:09:19.000000000 +0200
+@@ -1277,19 +1277,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 GabeditSrc235/src/Geometry/PreviewGeom.c.gtk GabeditSrc235/src/Geometry/PreviewGeom.c
+--- GabeditSrc235/src/Geometry/PreviewGeom.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/PreviewGeom.c	2011-07-19 20:09:19.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 GabeditSrc235/src/Geometry/ResultsAnalise.c.gtk GabeditSrc235/src/Geometry/ResultsAnalise.c
+--- GabeditSrc235/src/Geometry/ResultsAnalise.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/ResultsAnalise.c	2011-07-19 20:09:19.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 GabeditSrc235/src/Geometry/SelectionDlg.c.gtk GabeditSrc235/src/Geometry/SelectionDlg.c
+--- GabeditSrc235/src/Geometry/SelectionDlg.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/SelectionDlg.c	2011-07-19 20:17:10.000000000 +0200
+@@ -906,19 +906,19 @@ void selectionDlg()
+ 	*/
+ 
+ 	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, 1);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win));
+ 	gtk_widget_show (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(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, 1);
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply, GTK_OBJECT(treeView));
  
- 	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);
- 	  
+ 	button = create_button(Win,_("OK"));
+ 	gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 1);
+-	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/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 01:23:55.144292018 +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);
+@@ -1220,13 +1220,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_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);
+ 	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);
      
  
-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 01:23:55.145292770 +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);
+@@ -1312,13 +1312,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);
  
-   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);
+ 	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);
+     
  
-   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 01:23:55.146292544 +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);
+@@ -1401,13 +1401,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_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);
+ 	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);
      
  
-@@ -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);
+@@ -1490,13 +1490,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_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);
+ 	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);
      
  
-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 01:23:55.147292807 +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);
+@@ -1579,13 +1579,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(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(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);
+     
  
-   /*
-   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 01:23:55.147292807 +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));
+@@ -1724,13 +1724,13 @@ void selectAtomsBySphereDlg()
+ 	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);
- 	gtk_widget_show (button);
  
- 	button = create_button(Wins,_("OK"));
-@@ -196,7 +196,7 @@ static void mopacInputFileWindow(gboolea
- 	gtk_widget_set_sensitive(hbox, FALSE);
+ 	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)selectAtomsBySphere,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);
  
- 	gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5);
+ 	gtk_widget_show_all(winDlg);
+diff -up GabeditSrc235/src/Geometry/Symmetry.c.gtk GabeditSrc235/src/Geometry/Symmetry.c
+--- GabeditSrc235/src/Geometry/Symmetry.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Geometry/Symmetry.c	2011-07-19 20:09:19.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 GabeditSrc235/src/Molcas/MolcasBasis.c.gtk GabeditSrc235/src/Molcas/MolcasBasis.c
+--- GabeditSrc235/src/Molcas/MolcasBasis.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Molcas/MolcasBasis.c	2011-07-19 20:09:19.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(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 01:23:55.148292092 +0200
-@@ -778,13 +778,13 @@ static void newAtomDlg()
- 	Button = create_button(WinDlg,_("Cancel"));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(destroy_children),GTK_OBJECT(dlgWin));
+diff -up GabeditSrc235/src/Molcas/MolcasBasisLibrary.c.gtk GabeditSrc235/src/Molcas/MolcasBasisLibrary.c
+--- GabeditSrc235/src/Molcas/MolcasBasisLibrary.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Molcas/MolcasBasisLibrary.c	2011-07-19 20:09:19.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"));
+ 	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));
@@ -1782,14 +2220,14 @@ diff -up GabeditSrc230/src/MPQC/MPQCBasisLibrary.c.gtk GabeditSrc230/src/MPQC/MP
  	gtk_widget_grab_default(Button);
      
  
-@@ -915,13 +915,13 @@ static void newBasisDlg()
- 	Button = create_button(WinDlg,_("Cancel"));
+@@ -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"));
+ 	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));
@@ -1798,14 +2236,14 @@ diff -up GabeditSrc230/src/MPQC/MPQCBasisLibrary.c.gtk GabeditSrc230/src/MPQC/MP
  	gtk_widget_grab_default(Button);
      
  
-@@ -1034,13 +1034,13 @@ static void editBasisDlg()
- 	Button = create_button(WinDlg,_("Cancel"));
+@@ -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"));
+ 	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));
@@ -1814,10 +2252,10 @@ diff -up GabeditSrc230/src/MPQC/MPQCBasisLibrary.c.gtk GabeditSrc230/src/MPQC/MP
  	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 01:23:55.148292092 +0200
-@@ -192,7 +192,7 @@ static void mpqcInputFileWindow(gboolean
+diff -up GabeditSrc235/src/Molcas/Molcas.c.gtk GabeditSrc235/src/Molcas/Molcas.c
+--- GabeditSrc235/src/Molcas/Molcas.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Molcas/Molcas.c	2011-07-19 20:09:19.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));
@@ -1825,9 +2263,9 @@ diff -up GabeditSrc230/src/MPQC/MPQC.c.gtk GabeditSrc230/src/MPQC/MPQC.c
 +	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);
+ 
+@@ -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);
@@ -1835,941 +2273,558 @@ diff -up GabeditSrc230/src/MPQC/MPQC.c.gtk GabeditSrc230/src/MPQC/MPQC.c
  	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 01:23:55.149291866 +0200
-@@ -574,7 +574,7 @@ void mpqcSumDensityFunctionalWindow()
+diff -up GabeditSrc235/src/Molcas/MolcasGateWay.c.gtk GabeditSrc235/src/Molcas/MolcasGateWay.c
+--- GabeditSrc235/src/Molcas/MolcasGateWay.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Molcas/MolcasGateWay.c	2011-07-19 20:09:19.000000000 +0200
+@@ -1555,7 +1555,7 @@ static void createViewInfoAbelianGroupWi
  
- 	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));
+ 	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 GabeditSrc235/src/MolecularMechanics/MolecularMechanicsDlg.c.gtk GabeditSrc235/src/MolecularMechanics/MolecularMechanicsDlg.c
+--- GabeditSrc235/src/MolecularMechanics/MolecularMechanicsDlg.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/MolecularMechanics/MolecularMechanicsDlg.c	2011-07-19 20:09:19.000000000 +0200
+@@ -3950,13 +3950,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);
  
- 	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 01:23:55.149291866 +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 01:23:55.150292129 +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 01:23:55.152291188 +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);
+ 	button = create_button(Win,"Ok");
 -	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_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);
+@@ -3993,13 +3993,13 @@ void MolecularMechanicsMinimizeDlg()
  	gtk_widget_realize(Win);
  
- 	button = create_button(Win,_("Cancel"));
+ 	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
+ 	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_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ 	button = create_button(Win,"Ok");
 -	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 +	gtk_widget_set_can_default(button, TRUE);
- 	gtk_widget_grab_default(button);
+ 	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);
- 	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 01:23:55.153291451 +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
+@@ -4039,13 +4039,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( 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
+ 	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_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ 	button = create_button(Win,"Ok");
 -	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 +	gtk_widget_set_can_default(button, TRUE);
- 	gtk_widget_grab_default(button);
+ 	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);
- 	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 01:23:55.154291224 +0200
-@@ -183,14 +183,14 @@ static void create_images_window (gint n
+@@ -4084,13 +4084,13 @@ void MolecularMechanicsDynamicsConfoDlg(
+ 	gtk_widget_realize(Win);
  
- 	button = create_button(window,"Screen capture PNG");
- 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+ 	button = create_button(Win,"Cancel");
 -	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 +	gtk_widget_set_can_default(button, TRUE);
- 	gtk_widget_grab_default(button);
+ 	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);
- 	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);
+ 	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);
- 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)export_jpeg_file_dlg,G_OBJECT(table));
+diff -up GabeditSrc235/src/MolecularMechanics/SetMMParameters.c.gtk GabeditSrc235/src/MolecularMechanics/SetMMParameters.c
+--- GabeditSrc235/src/MolecularMechanics/SetMMParameters.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/MolecularMechanics/SetMMParameters.c	2011-07-19 20:09:19.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);
  
-@@ -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(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(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 01:23:55.154291224 +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 01:23:55.155290510 +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(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(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(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(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(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(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 01:23:55.155290510 +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);  
+ 	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);
- 	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 01:23:55.156290283 +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;
+ 	  
+ 	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);
  
-     	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(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);
+ 	  
  
-     	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;
+@@ -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);
  
-@@ -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;
+ 	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);
+ 	  
  
- 	/* 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 01:23:55.156290283 +0200
-@@ -422,7 +422,7 @@ static void create_list_adf_orbitals()
-   gtk_widget_realize(Win);
+diff -up GabeditSrc235/src/MolecularMechanics/SetPDBTemplate.c.gtk GabeditSrc235/src/MolecularMechanics/SetPDBTemplate.c
+--- GabeditSrc235/src/MolecularMechanics/SetPDBTemplate.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/MolecularMechanics/SetPDBTemplate.c	2011-07-19 20:09:19.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(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(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);
+     
  
-   button = create_button(Win,"OK");
-   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+diff -up GabeditSrc235/src/Molpro/MInterfaceBasis.c.gtk GabeditSrc235/src/Molpro/MInterfaceBasis.c
+--- GabeditSrc235/src/Molpro/MInterfaceBasis.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Molpro/MInterfaceBasis.c	2011-07-19 20:09:19.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);
-   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 01:23:55.157292013 +0200
-@@ -1152,13 +1152,13 @@ static GtkWidget* showResultDlg(gchar *m
+   gtk_widget_show(button);
    
- 	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 GabeditSrc235/src/Molpro/MolproBasisLibrary.c.gtk GabeditSrc235/src/Molpro/MolproBasisLibrary.c
+--- GabeditSrc235/src/Molpro/MolproBasisLibrary.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Molpro/MolproBasisLibrary.c	2011-07-19 20:09:19.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);
  
-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 01:23:55.158291787 +0200
-@@ -317,7 +317,7 @@ void create_scale_dlg()
- 	gtk_widget_realize(Win);
+ 	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);
+     
  
- 	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()
+@@ -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(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(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);
+     
  
-   button = create_button(fp,_("Cancel"));
+diff -up GabeditSrc235/src/Molpro/Molpro.c.gtk GabeditSrc235/src/Molpro/Molpro.c
+--- GabeditSrc235/src/Molpro/Molpro.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Molpro/Molpro.c	2011-07-19 20:09:19.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_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);
+   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_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 01:23:55.159293027 +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
+   g_signal_connect(G_OBJECT(button), "clicked", (GCallback)GetInfo,NULL);
+@@ -748,14 +748,14 @@ void molpro()
+   gtk_widget_realize(Wins);
  
-   button = create_button(Win,"OK");
-   gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+   button = create_button(Wins,_("Cancel"));
 -  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 +  gtk_widget_set_can_default(button, TRUE);
-   gtk_widget_grab_default(button);
+   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);
-   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 01:23:55.159293027 +0200
-@@ -567,7 +567,7 @@ void create_planeGrid_center_vector(gcha
-   gtk_widget_realize(Win);
  
-   button = create_button(Win,_("Cancel"));
+   /*
+   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( 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_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_widget_grab_default(button);
+   gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0);
    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 01:23:55.160290357 +0200
-@@ -472,14 +472,14 @@ void create_window_list_grids(GtkWidget 
- 	gtk_widget_realize(fp);
- 
- 	button = create_button(fp,"Cancel");
+   gtk_widget_grab_default(button);
+diff -up GabeditSrc235/src/Mopac/Mopac.c.gtk GabeditSrc235/src/Mopac/Mopac.c
+--- GabeditSrc235/src/Mopac/Mopac.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Mopac/Mopac.c	2011-07-19 20:09:19.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_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 01:23:55.161291109 +0200
-@@ -1234,13 +1234,13 @@ void coulomb_orbitals_dlg()
+ 	button = create_button(Wins,_("OK"));
+@@ -196,7 +196,7 @@ static void mopacInputFileWindow(gboolea
+ 	gtk_widget_set_sensitive(hbox, FALSE);
  
- 	button = create_button(Win,_("OK"));
- 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+ 	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",(GCallback)apply_coulomb_orbitals,G_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins));
+diff -up GabeditSrc235/src/MPQC/MPQCBasisLibrary.c.gtk GabeditSrc235/src/MPQC/MPQCBasisLibrary.c
+--- GabeditSrc235/src/MPQC/MPQCBasisLibrary.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/MPQC/MPQCBasisLibrary.c	2011-07-19 20:09:19.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(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(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);
+     
  
- 	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));
+@@ -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(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(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);
+     
  
- 	button = create_button(Win,_("OK"));
- 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+@@ -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 GabeditSrc235/src/MPQC/MPQC.c.gtk GabeditSrc235/src/MPQC/MPQC.c
+--- GabeditSrc235/src/MPQC/MPQC.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/MPQC/MPQC.c	2011-07-19 20:09:19.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_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 01:23:55.161291109 +0200
-@@ -746,19 +746,19 @@ void set_title_dlg()
+ 	button = create_button(Wins,"OK");
+@@ -220,7 +220,7 @@ static void mpqcInputFileWindow(gboolean
+ 	createMPQCProperties(hbox);
  
- 	button = create_button(Win,_("OK"));
- 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+ 	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",(GCallback)apply_set_title_close,G_OBJECT(Win));
+ 	g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins));
+diff -up GabeditSrc235/src/MPQC/MPQCFunctionals.c.gtk GabeditSrc235/src/MPQC/MPQCFunctionals.c
+--- GabeditSrc235/src/MPQC/MPQCFunctionals.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/MPQC/MPQCFunctionals.c	2011-07-19 20:09:19.000000000 +0200
+@@ -574,7 +574,7 @@ void mpqcSumDensityFunctionalWindow()
  
- 	button = create_button(Win,_("Apply"));
- 	gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+ 	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",(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 01:23:55.162291371 +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);
+ 	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_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 01:23:55.163291145 +0200
-@@ -1739,14 +1739,14 @@ void create_window_list_orbitals(GtkWidg
+ 	gtk_widget_show_all(win);
+diff -up GabeditSrc235/src/NetWork/Batch.c.gtk GabeditSrc235/src/NetWork/Batch.c
+--- GabeditSrc235/src/NetWork/Batch.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/NetWork/Batch.c	2011-07-19 20:09:19.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, 5);
-   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(fp));
+   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, 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 01:23:55.164291408 +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);
+   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(Win,_("Cancel"));
+   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)delete_child, GTK_OBJECT(Win));
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp));
    gtk_widget_show (button);
  
-   button = create_button(Win,_("OK"));
+   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)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 01:23:55.164291408 +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 01:23:55.165291671 +0200
-@@ -158,14 +158,14 @@ void set_colors_surfaces(gchar* title)
+   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 GabeditSrc235/src/NetWork/Process.c.gtk GabeditSrc235/src/NetWork/Process.c
+--- GabeditSrc235/src/NetWork/Process.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/NetWork/Process.c	2011-07-19 20:09:19.000000000 +0200
+@@ -482,14 +482,14 @@ void create_process_remote(gboolean all)
+   gtk_widget_realize(fp);
  
-   button = create_button(Win,_("Cancel"));
+   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_selectors_window,GTK_OBJECT(Win));
-   gtk_widget_show_all (button);
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp));
+   gtk_widget_show (button);
  
-   button = create_button(Win,_("OK"));
+   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_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);
+   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(Win,_("Cancel"));
+   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_setlight_window, GTK_OBJECT(Win));
+   g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp));
    gtk_widget_show (button);
  
-   button = create_button(Win,_("OK"));
+   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)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 01:23:55.165291671 +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);
--	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_opacity_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_opacity,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/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-27 01:23:55.167292197 +0200
-@@ -1117,7 +1117,7 @@ void create_grid(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, G_OBJECT(Win));
- 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
-@@ -1125,7 +1125,7 @@ void create_grid(gchar* title)
- 
- 	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)applygrid,G_OBJECT(Win));
-@@ -1332,7 +1332,7 @@ void create_grid_ELF_Dens_analyze(gboole
- 	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, G_OBJECT(Win));
- 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
-@@ -1340,7 +1340,7 @@ void create_grid_ELF_Dens_analyze(gboole
- 
- 	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)applyelfdens,G_OBJECT(Win));
-@@ -2150,7 +2150,7 @@ void create_grid_sas(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, G_OBJECT(Win));
- 	g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
-@@ -2158,7 +2158,7 @@ void create_grid_sas(gchar* title)
- 
- 	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)applygridsas,G_OBJECT(Win));
-@@ -2276,19 +2276,19 @@ void set_scale_ball_stick_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_scale_ball_stick_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_scale_ball_stick,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));
-@@ -2320,7 +2320,7 @@ static void resetGridColorMap()
- 			g_object_set_data(G_OBJECT(entryRight),"ColorMap", colorMap);
- 			g_object_set_data(G_OBJECT(darea),"ColorMap", colorMap);
- 			color_map_refresh(handleBoxColorMapGrid);
--			if(GTK_WIDGET_VISIBLE(handleBoxColorMapGrid))
-+			if(gtk_widget_get_visible(handleBoxColorMapGrid))
- 			{
- 				gtk_widget_hide(handleBoxColorMapGrid);
- 				gtk_widget_show(handleBoxColorMapGrid);
-@@ -2351,7 +2351,7 @@ static void resetPlanesMappedColorMap()
- 			g_object_set_data(G_OBJECT(entryRight),"ColorMap", colorMap);
- 			g_object_set_data(G_OBJECT(darea),"ColorMap", colorMap);
- 			color_map_refresh(handleBoxColorMapPlanesMapped);
--			if(GTK_WIDGET_VISIBLE(handleBoxColorMapPlanesMapped))
-+			if(gtk_widget_get_visible(handleBoxColorMapPlanesMapped))
- 			{
- 				gtk_widget_hide(handleBoxColorMapPlanesMapped);
- 				gtk_widget_show(handleBoxColorMapPlanesMapped);
-@@ -2384,7 +2384,7 @@ static void resetContoursColorMap()
- 			g_object_set_data(G_OBJECT(entryRight),"ColorMap", colorMap);
- 			g_object_set_data(G_OBJECT(darea),"ColorMap", colorMap);
- 			color_map_refresh(handleBoxColorMapContours);
--			if(GTK_WIDGET_VISIBLE(handleBoxColorMapContours))
-+			if(gtk_widget_get_visible(handleBoxColorMapContours))
- 			{
- 				gtk_widget_hide(handleBoxColorMapContours);
- 				gtk_widget_show(handleBoxColorMapContours);
-@@ -2574,18 +2574,18 @@ void createColorMapOptionsWindow(GtkWidg
- 
- 	button = create_button(dialogWindow,_("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)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,_("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 = 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)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 01:23:55.168293437 +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 01:23:55.169291256 +0200
+   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 GabeditSrc235/src/Orca/Orca.c.gtk GabeditSrc235/src/Orca/Orca.c
+--- GabeditSrc235/src/Orca/Orca.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Orca/Orca.c	2011-07-19 20:09:19.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);
@@ -2788,9 +2843,9 @@ diff -up GabeditSrc230/src/Orca/Orca.c.gtk GabeditSrc230/src/Orca/Orca.c
  	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 01:23:55.170286630 +0200
+diff -up GabeditSrc235/src/QChem/QChem.c.gtk GabeditSrc235/src/QChem/QChem.c
+--- GabeditSrc235/src/QChem/QChem.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/QChem/QChem.c	2011-07-19 20:09:19.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);
@@ -2809,10 +2864,10 @@ diff -up GabeditSrc230/src/QChem/QChem.c.gtk GabeditSrc230/src/QChem/QChem.c
  	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 01:23:55.172292533 +0200
-@@ -2400,13 +2400,13 @@ void semiEmpiricalDlg(gchar* type)
+diff -up GabeditSrc235/src/SemiEmpirical/SemiEmpiricalDlg.c.gtk GabeditSrc235/src/SemiEmpirical/SemiEmpiricalDlg.c
+--- GabeditSrc235/src/SemiEmpirical/SemiEmpiricalDlg.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/SemiEmpirical/SemiEmpiricalDlg.c	2011-07-19 20:09:19.000000000 +0200
+@@ -2398,13 +2398,13 @@ void semiEmpiricalDlg(gchar* type)
  	gtk_widget_realize(Win);
  
  	button = create_button(Win,"Cancel");
@@ -2828,7 +2883,7 @@ diff -up GabeditSrc230/src/SemiEmpirical/SemiEmpiricalDlg.c.gtk GabeditSrc230/sr
  	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()
+@@ -5311,13 +5311,13 @@ void semiEmpiricalMolecularDynamicsDlg()
  	gtk_widget_realize(Win);
  
  	button = create_button(Win,"Cancel");
@@ -2844,7 +2899,7 @@ diff -up GabeditSrc230/src/SemiEmpirical/SemiEmpiricalDlg.c.gtk GabeditSrc230/sr
  	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
+@@ -5355,13 +5355,13 @@ void semiEmpiricalMolecularDynamicsConfo
  	gtk_widget_realize(Win);
  
  	button = create_button(Win,"Cancel");
@@ -2860,9 +2915,9 @@ diff -up GabeditSrc230/src/SemiEmpirical/SemiEmpiricalDlg.c.gtk GabeditSrc230/sr
  	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 01:23:55.173290840 +0200
+diff -up GabeditSrc235/src/Spectrum/ECDSpectrum.c.gtk GabeditSrc235/src/Spectrum/ECDSpectrum.c
+--- GabeditSrc235/src/Spectrum/ECDSpectrum.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Spectrum/ECDSpectrum.c	2011-07-19 20:09:19.000000000 +0200
 @@ -680,14 +680,14 @@ static gboolean read_qchem_file_multiple
  	gtk_widget_show(hbox);
  
@@ -2880,9 +2935,9 @@ diff -up GabeditSrc230/src/Spectrum/ECDSpectrum.c.gtk GabeditSrc230/src/Spectrum
  	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 01:23:55.173290840 +0200
+diff -up GabeditSrc235/src/Spectrum/UVSpectrum.c.gtk GabeditSrc235/src/Spectrum/UVSpectrum.c
+--- GabeditSrc235/src/Spectrum/UVSpectrum.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Spectrum/UVSpectrum.c	2011-07-19 20:09:19.000000000 +0200
 @@ -703,14 +703,14 @@ static gboolean read_qchem_file_multiple
  	gtk_widget_show(hbox);
  
@@ -2900,9 +2955,9 @@ diff -up GabeditSrc230/src/Spectrum/UVSpectrum.c.gtk GabeditSrc230/src/Spectrum/
  	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 01:23:55.174291103 +0200
+diff -up GabeditSrc235/src/Symmetry/MoleculeSymmetryInterface.c.gtk GabeditSrc235/src/Symmetry/MoleculeSymmetryInterface.c
+--- GabeditSrc235/src/Symmetry/MoleculeSymmetryInterface.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Symmetry/MoleculeSymmetryInterface.c	2011-07-19 20:09:19.000000000 +0200
 @@ -210,7 +210,7 @@ void createGeometrySymmetryWindow(gint n
  	
  	Bouton = create_button(Dialogue,"OK");
@@ -2937,9 +2992,9 @@ diff -up GabeditSrc230/src/Symmetry/MoleculeSymmetryInterface.c.gtk GabeditSrc23
  	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 01:23:55.174291103 +0200
+diff -up GabeditSrc235/src/Utils/AtomsProp.c.gtk GabeditSrc235/src/Utils/AtomsProp.c
+--- GabeditSrc235/src/Utils/AtomsProp.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Utils/AtomsProp.c	2011-07-19 20:09:19.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));
@@ -2966,9 +3021,9 @@ diff -up GabeditSrc230/src/Utils/AtomsProp.c.gtk GabeditSrc230/src/Utils/AtomsPr
    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 01:23:55.175290877 +0200
+diff -up GabeditSrc235/src/Utils/ConvUtils.c.gtk GabeditSrc235/src/Utils/ConvUtils.c
+--- GabeditSrc235/src/Utils/ConvUtils.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Utils/ConvUtils.c	2011-07-19 20:09:19.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));
@@ -2978,10 +3033,10 @@ diff -up GabeditSrc230/src/Utils/ConvUtils.c.gtk GabeditSrc230/src/Utils/ConvUti
  	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-27 01:23:55.179290462 +0200
-@@ -1758,14 +1758,14 @@ static void create_contours(GtkWidget* c
+diff -up GabeditSrc235/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc235/src/Utils/GabeditContoursPlot.c
+--- GabeditSrc235/src/Utils/GabeditContoursPlot.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Utils/GabeditContoursPlot.c	2011-07-19 20:09:19.000000000 +0200
+@@ -1760,14 +1760,14 @@ static void create_contours(GtkWidget* c
  	gtk_widget_realize(window);
  
  	button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
@@ -2998,7 +3053,7 @@ diff -up GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc230/src/Uti
  	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(
+@@ -6207,17 +6207,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);	
@@ -3019,7 +3074,7 @@ diff -up GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc230/src/Uti
  	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
+@@ -7083,7 +7083,7 @@ static void gabedit_contoursplot_realize
    g_return_if_fail (widget != NULL);
    g_return_if_fail (GABEDIT_IS_ContoursPLOT (widget));
  
@@ -3028,7 +3083,7 @@ diff -up GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc230/src/Uti
    contoursplot = GABEDIT_ContoursPLOT (widget);
  
    attributes.x = widget->allocation.x;
-@@ -7501,7 +7501,7 @@ static void gabedit_contoursplot_size_al
+@@ -7503,7 +7503,7 @@ static void gabedit_contoursplot_size_al
    widget->allocation = *allocation;
    contoursplot=GABEDIT_ContoursPLOT(widget);  
  
@@ -3037,7 +3092,7 @@ diff -up GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc230/src/Uti
      gdk_window_move_resize (widget->window,
  			allocation->x, 
  			allocation->y,
-@@ -8531,7 +8531,7 @@ static void set_old_area(GtkWidget *widg
+@@ -8532,7 +8532,7 @@ static void set_old_area(GtkWidget *widg
  	if (contoursplot->old_area!=NULL) g_object_unref(G_OBJECT(contoursplot->old_area));
  	contoursplot->old_area=NULL;
  
@@ -3046,7 +3101,7 @@ diff -up GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc230/src/Uti
  	{
  		contoursplot->old_area=gdk_pixmap_copy(widget->window);
  	}
-@@ -10530,7 +10530,7 @@ static void contoursplot_calculate_sizes
+@@ -10531,7 +10531,7 @@ static void contoursplot_calculate_sizes
    if (contoursplot->cairo_widget!=NULL) cairo_destroy (contoursplot->cairo_widget);
    if (contoursplot->cairo_area!=NULL) cairo_destroy (contoursplot->cairo_area);
  
@@ -3055,7 +3110,7 @@ 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()
+@@ -11148,7 +11148,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);  
@@ -3064,9 +3119,9 @@ diff -up GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc230/src/Uti
  	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-27 01:23:55.183290535 +0200
+diff -up GabeditSrc235/src/Utils/GabeditXYPlot.c.gtk GabeditSrc235/src/Utils/GabeditXYPlot.c
+--- GabeditSrc235/src/Utils/GabeditXYPlot.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Utils/GabeditXYPlot.c	2011-07-19 20:09:19.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));
@@ -3112,9 +3167,9 @@ diff -up GabeditSrc230/src/Utils/GabeditXYPlot.c.gtk GabeditSrc230/src/Utils/Gab
  	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 01:23:55.183290535 +0200
+diff -up GabeditSrc235/src/Utils/PovrayUtils.c.gtk GabeditSrc235/src/Utils/PovrayUtils.c
+--- GabeditSrc235/src/Utils/PovrayUtils.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Utils/PovrayUtils.c	2011-07-19 20:09:19.000000000 +0200
 @@ -137,13 +137,13 @@ void createPovrayOptionsWindow(GtkWidget
  
  	button = create_button(dialogWindow,"Cancel");
@@ -3131,9 +3186,9 @@ diff -up GabeditSrc230/src/Utils/PovrayUtils.c.gtk GabeditSrc230/src/Utils/Povra
  	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 01:23:55.184291776 +0200
+diff -up GabeditSrc235/src/Utils/UtilsInterface.c.gtk GabeditSrc235/src/Utils/UtilsInterface.c
+--- GabeditSrc235/src/Utils/UtilsInterface.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/Utils/UtilsInterface.c	2011-07-19 20:09:19.000000000 +0200
 @@ -639,7 +639,7 @@ GtkWidget* Message(char *message,char *t
    
    Bouton = create_button(DialogueMessage,_("OK"));
@@ -3167,7 +3222,7 @@ diff -up GabeditSrc230/src/Utils/UtilsInterface.c.gtk GabeditSrc230/src/Utils/Ut
      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
+@@ -2287,12 +2287,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));
@@ -3182,9 +3237,9 @@ diff -up GabeditSrc230/src/Utils/UtilsInterface.c.gtk GabeditSrc230/src/Utils/Ut
  	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 01:23:55.185290572 +0200
+diff -up GabeditSrc235/src/VibrationalCorrections/GabeditGaussianInput.c.gtk GabeditSrc235/src/VibrationalCorrections/GabeditGaussianInput.c
+--- GabeditSrc235/src/VibrationalCorrections/GabeditGaussianInput.c.gtk	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/src/VibrationalCorrections/GabeditGaussianInput.c	2011-07-19 20:09:19.000000000 +0200
 @@ -259,7 +259,7 @@ static GtkWidget* createResultWindow(gch
  
  	button = create_button(resultWindow,_("OK"));
diff --git a/gabedit-ld.patch b/gabedit-ld.patch
index baf28e6..2d3b0bc 100644
--- a/gabedit-ld.patch
+++ b/gabedit-ld.patch
@@ -1,12 +1,12 @@
-diff -up GabeditSrc229/Makefile.ld GabeditSrc229/Makefile
---- GabeditSrc229/Makefile.ld	2009-12-22 17:21:28.000000000 +0100
-+++ GabeditSrc229/Makefile	2010-02-15 22:22:50.000000000 +0100
-@@ -66,7 +66,7 @@ $(SUBDIRS):
- all: gabedit
- 
+diff -up GabeditSrc235/Makefile.ld GabeditSrc235/Makefile
+--- GabeditSrc235/Makefile.ld	2011-01-27 09:03:26.000000000 +0100
++++ GabeditSrc235/Makefile	2011-07-19 19:39:45.000000000 +0200
+@@ -61,7 +61,7 @@ all: gabedit
  gabedit: $(SUBDIRS)
--	$(CC) $(LDFLAGS) $(OBJECTS) -o gabedit $(X11LIB) $(GTKLIB) $(OGLLIB) $(JPEGLIB) $(LIBPTHREAD) $(WIN32LIB) -g
-+	$(CC) $(LDFLAGS) $(OBJECTS) -o gabedit $(X11LIB) $(GTKLIB) $(OGLLIB) $(JPEGLIB) $(LIBPTHREAD) $(WIN32LIB) -lm -g
-  
- clean:
- 	@$(RM) gabedit
+ 	mkdir tmp
+ 	cp $(OBJECTS) tmp
+-	$(CC) $(LDFLAGS) tmp/*.o -o gabedit $(GLTOPS) $(X11LIB) $(GTKLIB) $(OGLLIB) $(JPEGLIB) $(LIBPTHREAD) $(WIN32LIB) $(OMPLIB) -g
++	$(CC) $(LDFLAGS) tmp/*.o -o gabedit $(GLTOPS) $(X11LIB) $(GTKLIB) $(OGLLIB) $(JPEGLIB) $(LIBPTHREAD) $(WIN32LIB) $(OMPLIB) -lm -g
+ 	@$(RMTMP) > ptmp
+ 	rmdir tmp
+ 	@$(RM) ptmp
diff --git a/gabedit.spec b/gabedit.spec
index e558b8e..9d0db81 100644
--- a/gabedit.spec
+++ b/gabedit.spec
@@ -1,9 +1,8 @@
-%define version	2.3.0
-%define tarver	230
+%define tarver	235
 
 Name:		gabedit
 Summary:	GUI for computational chemistry
-Version:	%{version}
+Version:	2.3.5
 Release:	1%{?dist}
 Source0:	http://downloads.sourceforge.net/sourceforge/gabedit/GabeditSrc%{tarver}.tar.gz
 Patch0:		%{name}-ld.patch
@@ -16,7 +15,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:	desktop-file-utils
 BuildRequires:	gl2ps-devel >= 1.3.5
 BuildRequires:	gtk2-devel
-BuildRequires:	gtkglarea2-devel
+BuildRequires:	gtkglext-devel
 BuildRequires:	libGLU-devel
 BuildRequires:	libjpeg-devel
 
@@ -87,6 +86,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*.png
 
 %changelog
+* Tue Jul 19 2011 Dominik Mierzejewski <rpm at greysector.net> 2.3.5-1
+- updated to latest stable version (2.3.5)
+- upstream switched from gtkglarea to gtkglext, adjust BRs
+
 * Thu Aug 26 2010 Dominik Mierzejewski <rpm at greysector.net> 2.3.0-1
 - updated to latest stable version (2.3.0)
 - rebased gtk patch
diff --git a/sources b/sources
index 2237c54..6eb2582 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fccf846b682003d9b75d879e7f72a04a  GabeditSrc230.tar.gz
+69b2f5de886e7e70050579a97650092b  GabeditSrc235.tar.gz


More information about the scm-commits mailing list