diff -up GabeditSrc239/src/Common/Exit.c.gtk GabeditSrc239/src/Common/Exit.c --- GabeditSrc239/src/Common/Exit.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Common/Exit.c 2011-07-18 20:59:26.000000000 +0200 @@ -173,13 +173,13 @@ void ExitDlg(GtkWidget* w, gpointer data button = create_button(Win,"No"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win)); gtk_widget_show (button); button = create_button(Win,"Yes"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)ExitGabedit,GTK_OBJECT(Win)); gtk_widget_grab_default(button); diff -up GabeditSrc239/src/Common/Install.c.gtk GabeditSrc239/src/Common/Install.c --- GabeditSrc239/src/Common/Install.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Common/Install.c 2011-07-18 20:59:26.000000000 +0200 @@ -22,6 +22,8 @@ DEALINGS IN THE SOFTWARE. #include <sys/stat.h> #include <stdio.h> #include <stdlib.h> +#include <gdk/gdk.h> +#include <gtk/gtk.h> #include "Global.h" #include "../Utils/UtilsInterface.h" @@ -308,7 +310,7 @@ static void user_install_cancel_callback gtk_widget_destroy(continue_button); user_install_notebook_set_current_page(GTK_NOTEBOOK(notebook), EEK_PAGE); - timeout = g_timeout_add(1024, (GtkFunction)gtk_main_quit, (gpointer)0); + timeout = g_timeout_add(1024, (GSourceFunc)gtk_main_quit, (gpointer)0); } /********************************************************************************/ static gint user_install_corner_expose(GtkWidget *widget, @@ -463,13 +465,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)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); cancel_button = button; gtk_widget_show_all (button); button = create_button(dialog,_(" Continue ")); gtk_box_pack_end (GTK_BOX(action_area), button, FALSE, TRUE, 0); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); continue_button = button; g_signal_connect(G_OBJECT(button), "clicked", (GCallback)user_install_continue_callback,callback); diff -up GabeditSrc239/src/Common/MenuToolBar.c.gtk GabeditSrc239/src/Common/MenuToolBar.c --- GabeditSrc239/src/Common/MenuToolBar.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Common/MenuToolBar.c 2011-07-18 20:59:26.000000000 +0200 @@ -17,8 +17,9 @@ CONTRACT, TORT OR OTHERWISE, ARISING FRO DEALINGS IN THE SOFTWARE. ************************************************************************************************************/ - #include "../../Config.h" +#include <gtk/gtk.h> + #include "../Common/Global.h" #include "../Utils/Utils.h" #include "../Utils/UtilsInterface.h" diff -up GabeditSrc239/src/Common/Preferences.c.gtk GabeditSrc239/src/Common/Preferences.c --- GabeditSrc239/src/Common/Preferences.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Common/Preferences.c 2011-07-18 20:59:26.000000000 +0200 @@ -2306,7 +2306,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); - 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_babel_selction), GTK_OBJECT(entry)); @@ -2355,7 +2355,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); - 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_gamessDir_selection), GTK_OBJECT(entry)); @@ -2399,7 +2399,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); - 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_orcaDir_selection), GTK_OBJECT(entry)); @@ -2487,7 +2487,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); - 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_fireflyDir_selection), GTK_OBJECT(entry)); @@ -2531,7 +2531,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); - 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_mopacDir_selection), GTK_OBJECT(entry)); @@ -2573,7 +2573,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); - 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_povrayDir_selection), GTK_OBJECT(entry)); @@ -2615,7 +2615,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); - 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_gaussDir_selection), GTK_OBJECT(entry)); @@ -2758,7 +2758,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); - 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_pscpplinkDir_selection), GTK_OBJECT(entry)); @@ -2976,13 +2976,13 @@ void create_preferences() gtk_widget_realize(Wins); button = create_button(Wins,"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_swapped(GTK_OBJECT(button), "clicked",(GCallback)destroy_preferences_window,GTK_OBJECT(Wins)); gtk_widget_show_all (button); button = create_button(Wins,_("Save&Apply&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",G_CALLBACK(apply_all),NULL); g_signal_connect(G_OBJECT(button), "clicked",G_CALLBACK(create_ressource_file),NULL); @@ -2991,7 +2991,7 @@ void create_preferences() gtk_widget_show_all (button); button = create_button(Wins,_("Apply&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",G_CALLBACK(apply_all),NULL); g_signal_connect_swapped(GTK_OBJECT(button), "clicked",(GCallback)destroy_preferences_window,GTK_OBJECT(Wins)); @@ -2999,7 +2999,7 @@ void create_preferences() gtk_widget_show_all (button); button = create_button(Wins,_("Apply")); - 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",G_CALLBACK(apply_all),NULL); gtk_widget_grab_default(button); @@ -3251,19 +3251,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)); @@ -3444,18 +3444,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 GabeditSrc239/src/Common/Printer.c.gtk GabeditSrc239/src/Common/Printer.c --- GabeditSrc239/src/Common/Printer.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Common/Printer.c 2011-07-18 20:59:26.000000000 +0200 @@ -399,20 +399,20 @@ void create_print_page() FrameOptions = NULL; 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(GTK_OBJECT(button), "clicked",G_CALLBACK(destroy_children),GTK_OBJECT(Wins)); gtk_widget_show (button); button = create_button(Wins,_("Display")); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(print_file),&button); - 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); ButtonDisplay = button; button = create_button(Wins,_("Print")); - 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", G_CALLBACK(print_file),NULL); g_signal_connect_swapped(GTK_OBJECT(button), "clicked",G_CALLBACK(destroy_children),GTK_OBJECT(Wins)); diff -up GabeditSrc239/src/Common/Run.c.gtk GabeditSrc239/src/Common/Run.c --- GabeditSrc239/src/Common/Run.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Common/Run.c 2011-07-18 20:59:26.000000000 +0200 @@ -99,9 +99,6 @@ void set_frame_remote_visibility(GtkWidg gint* type = NULL; if(!button) return; - if ((GTK_OBJECT_FLAGS((GtkObject*)button) & GTK_IN_DESTRUCTION)) return; - if ((GTK_OBJECT_FLAGS((GtkObject*)FrameRemote) & GTK_IN_DESTRUCTION)) return; - if ((GTK_OBJECT_FLAGS((GtkObject*)FrameNetWork) & GTK_IN_DESTRUCTION)) return; type = g_object_get_data (G_OBJECT (button), "TypeButton"); if(!type) return; @@ -401,7 +398,7 @@ GtkWidget* create_text_result_command(Gt gtk_widget_realize(Win); button = create_button(Win,_("OK")); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,G_OBJECT(Win)); gtk_widget_show (button); @@ -5183,10 +5180,6 @@ void changed_user(GtkWidget *combo,gpoin if (!GTK_IS_WIDGET((GtkWidget*)entry[2])) return; if (!GTK_IS_WIDGET((GtkWidget*)entry[3])) return; if (!GTK_IS_WIDGET((GtkWidget*)entry[5])) return; - if ((GTK_OBJECT_FLAGS((GtkObject*)entry[1]) & GTK_IN_DESTRUCTION)) return; - if ((GTK_OBJECT_FLAGS((GtkObject*)entry[2]) & GTK_IN_DESTRUCTION)) return; - if ((GTK_OBJECT_FLAGS((GtkObject*)entry[3]) & GTK_IN_DESTRUCTION)) return; - if ((GTK_OBJECT_FLAGS((GtkObject*)entry[5]) & GTK_IN_DESTRUCTION)) return; hostname = gtk_entry_get_text(GTK_ENTRY(entry[2])); @@ -5223,7 +5216,6 @@ void changed_user(GtkWidget *combo,gpoin return; - if (!(GTK_OBJECT_FLAGS((GtkObject*)combodir) & GTK_IN_DESTRUCTION)) gtk_combo_box_entry_set_popdown_strings( combodir, glist) ; @@ -5248,10 +5240,6 @@ void changed_host(GtkWidget *combo,gpoin if (!GTK_IS_WIDGET((GtkWidget*)entry[2])) return; if (!GTK_IS_WIDGET((GtkWidget*)entry[3])) return; if (!GTK_IS_WIDGET((GtkWidget*)entry[5])) return; - if ((GTK_OBJECT_FLAGS((GtkObject*)entry[1]) & GTK_IN_DESTRUCTION)) return; - if ((GTK_OBJECT_FLAGS((GtkObject*)entry[2]) & GTK_IN_DESTRUCTION)) return; - if ((GTK_OBJECT_FLAGS((GtkObject*)entry[3]) & GTK_IN_DESTRUCTION)) return; - if ((GTK_OBJECT_FLAGS((GtkObject*)entry[5]) & GTK_IN_DESTRUCTION)) return; hostname = gtk_entry_get_text(GTK_ENTRY(entry[2])); combouser = g_object_get_data (G_OBJECT (entry[3]), "Combo"); if(!combouser) return; @@ -5274,7 +5262,6 @@ void changed_host(GtkWidget *combo,gpoin return; - if (!(GTK_OBJECT_FLAGS((GtkObject*)combouser) & GTK_IN_DESTRUCTION)) for (i=0;i<nlistuser;i++) gtk_combo_box_entry_set_popdown_strings( combouser, glist) ; @@ -5517,14 +5504,14 @@ void create_run_dialogue_box(GtkWidget * gtk_widget_realize(fp); button = create_button(fp,"Cancel"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,G_OBJECT(fp)); gtk_widget_show (button); button = create_button(fp,"OK"); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); diff -up GabeditSrc239/src/Common/SplashScreen.c.gtk GabeditSrc239/src/Common/SplashScreen.c --- GabeditSrc239/src/Common/SplashScreen.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Common/SplashScreen.c 2011-07-18 20:59:26.000000000 +0200 @@ -20,6 +20,7 @@ DEALINGS IN THE SOFTWARE. #include "../../Config.h" #include <stdio.h> #include <string.h> +#include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> #include <GL/gl.h> #include <GL/glu.h> @@ -352,7 +353,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 GabeditSrc239/src/Common/TextEdit.c.gtk GabeditSrc239/src/Common/TextEdit.c --- GabeditSrc239/src/Common/TextEdit.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Common/TextEdit.c 2011-07-18 20:59:26.000000000 +0200 @@ -20,6 +20,7 @@ DEALINGS IN THE SOFTWARE. #include "../../Config.h" #include <string.h> +#include <gtk/gtk.h> #include "Global.h" #include "../Utils/UtilsInterface.h" diff -up GabeditSrc239/src/Display/AnimationGeomConv.c.gtk GabeditSrc239/src/Display/AnimationGeomConv.c --- GabeditSrc239/src/Display/AnimationGeomConv.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/AnimationGeomConv.c 2011-07-18 20:59:26.000000000 +0200 @@ -5208,7 +5208,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)); @@ -5281,7 +5281,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)); @@ -5289,7 +5289,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 GabeditSrc239/src/Display/AnimationMD.c.gtk GabeditSrc239/src/Display/AnimationMD.c --- GabeditSrc239/src/Display/AnimationMD.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/AnimationMD.c 2011-07-18 20:59:26.000000000 +0200 @@ -3048,7 +3048,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)); @@ -3121,7 +3121,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)); @@ -3129,7 +3129,7 @@ void add_cancel_ok_button(GtkWidget *Wi button = create_button(Win,"OK"); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)myFunc,GTK_OBJECT(Win)); diff -up GabeditSrc239/src/Display/CaptureOrbitals.c.gtk GabeditSrc239/src/Display/CaptureOrbitals.c --- GabeditSrc239/src/Display/CaptureOrbitals.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/CaptureOrbitals.c 2011-07-18 20:59:26.000000000 +0200 @@ -184,14 +184,14 @@ static void create_images_window (gint n button = create_button(window,"Screen capture PNG"); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)export_png_file_dlg,G_OBJECT(table)); button = create_button(window,"Screen capture JPEG"); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)export_jpeg_file_dlg,G_OBJECT(table)); @@ -1123,13 +1123,13 @@ void capture_orbitals_dlg() button = create_button(Win,"OK"); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_capture_orbitals,G_OBJECT(Win)); button = create_button(Win,"Cancel"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win)); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win)); diff -up GabeditSrc239/src/Display/ColorMap.c.gtk GabeditSrc239/src/Display/ColorMap.c --- GabeditSrc239/src/Display/ColorMap.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/ColorMap.c 2011-07-18 20:59:26.000000000 +0200 @@ -594,7 +594,7 @@ static gint configure_event( GtkWidget * tmpcolor.blue = (gushort)(color[2]*65535); gdk_colormap_alloc_color(colormap, &tmpcolor, FALSE, TRUE); - gdk_gc_set_foreground(gc,&tmpcolor); + gdk_cairo_set_source_color(gc,&tmpcolor); gdk_draw_line(pixmap,gc,i,0,i,height); } @@ -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 GabeditSrc239/src/Display/Contours.c.gtk GabeditSrc239/src/Display/Contours.c --- GabeditSrc239/src/Display/Contours.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/Contours.c 2011-07-18 20:59:26.000000000 +0200 @@ -467,7 +467,7 @@ void create_contours_isosurface() gtk_widget_realize(Win); button = create_button(Win,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win)); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win)); @@ -475,7 +475,7 @@ void create_contours_isosurface() button = create_button(Win,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_contours_isosurface,GTK_OBJECT(Win)); @@ -887,7 +887,7 @@ void create_contours(gchar* title,gint t gtk_widget_realize(Win); button = create_button(Win,"Cancel"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win)); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win)); @@ -895,7 +895,7 @@ void create_contours(gchar* title,gint t button = create_button(Win,"OK"); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_contours,GTK_OBJECT(Win)); @@ -1130,14 +1130,14 @@ void create_contours_plane(gchar* title) gtk_widget_realize(Win); button = create_button(Win,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win)); gtk_widget_show (button); button = create_button(Win,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_contours_plane,GTK_OBJECT(Win)); diff -up GabeditSrc239/src/Display/Dipole.c.gtk GabeditSrc239/src/Display/Dipole.c --- GabeditSrc239/src/Display/Dipole.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/Dipole.c 2011-07-18 20:59:26.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 GabeditSrc239/src/Display/GLArea.c.gtk GabeditSrc239/src/Display/GLArea.c --- GabeditSrc239/src/Display/GLArea.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/GLArea.c 2011-07-18 20:59:26.000000000 +0200 @@ -19,6 +19,7 @@ DEALINGS IN THE SOFTWARE. #include "../../Config.h" #include <gdk/gdkkeysyms.h> +#include <gtk/gtk.h> #include <gtk/gtkgl.h> /* #include <pthread.h>*/ #include "GlobalOrb.h" @@ -784,7 +785,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; if (gdk_gl_drawable_gl_begin (gldrawable, glcontext)) { @@ -1043,7 +1044,7 @@ gint redrawGL2PS() GLdouble m[4][4]; GtkWidget *widget = GLArea; if(!GTK_IS_WIDGET(widget)) return TRUE; - if(!GTK_WIDGET_REALIZED(widget)) return TRUE; + if(!gtk_widget_get_realized(widget)) return TRUE; glMatrixMode(GL_PROJECTION); glLoadIdentity(); @@ -1105,7 +1106,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; if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext)) return FALSE; @@ -1182,7 +1183,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; @@ -1199,7 +1200,7 @@ static gint reshape(GtkWidget *widget, G 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; if (gdk_gl_drawable_gl_begin (gldrawable, glcontext)) { @@ -1617,7 +1618,7 @@ gboolean NewGLArea(GtkWidget* vboxwin) /* Create new OpenGL widget. */ /* pthread_mutex_init (&theRender_mutex, NULL);*/ GLArea = gtk_drawing_area_new (); - gtk_drawing_area_size(GTK_DRAWING_AREA(GLArea),(gint)(ScreenHeight*0.2),(gint)(ScreenHeight*0.2)); + gtk_widget_set_size_request(GTK_WIDGET(GLArea),(gint)(ScreenHeight*0.2),(gint)(ScreenHeight*0.2)); gtk_table_attach(GTK_TABLE(table),GLArea,1,2,0,1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND ), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND ), 0,0); gtk_widget_show(GTK_WIDGET(GLArea)); /* Events for widget must be set before X Window is created */ diff -up GabeditSrc239/src/Display/GridAdfOrbitals.c.gtk GabeditSrc239/src/Display/GridAdfOrbitals.c --- GabeditSrc239/src/Display/GridAdfOrbitals.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/GridAdfOrbitals.c 2011-07-18 20:59:26.000000000 +0200 @@ -422,7 +422,7 @@ static void create_list_adf_orbitals() gtk_widget_realize(Win); button = create_button(Win,"Cancel"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win)); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win)); @@ -430,7 +430,7 @@ static void create_list_adf_orbitals() button = create_button(Win,"OK"); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect(G_OBJECT(button), "clicked",(GCallback)read_orbital,gtklist); diff -up GabeditSrc239/src/Display/GridCP.c.gtk GabeditSrc239/src/Display/GridCP.c --- GabeditSrc239/src/Display/GridCP.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/GridCP.c 2011-07-18 20:59:26.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(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 GabeditSrc239/src/Display/GridCube.c.gtk GabeditSrc239/src/Display/GridCube.c --- GabeditSrc239/src/Display/GridCube.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/GridCube.c 2011-07-18 20:59:26.000000000 +0200 @@ -317,7 +317,7 @@ void create_scale_dlg() gtk_widget_realize(Win); button = create_button(Win,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win)); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win)); @@ -325,7 +325,7 @@ void create_scale_dlg() button = create_button(Win,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)applyScale,GTK_OBJECT(Win)); @@ -1508,14 +1508,14 @@ static void create_window_list_orbitals_ gtk_widget_realize(fp); button = create_button(fp,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(fp)); gtk_widget_show (button); button = create_button(fp,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_object_set_data(G_OBJECT (button), "Window", fp); diff -up GabeditSrc239/src/Display/GridMolcas.c.gtk GabeditSrc239/src/Display/GridMolcas.c --- GabeditSrc239/src/Display/GridMolcas.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/GridMolcas.c 2011-07-18 20:59:26.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 GabeditSrc239/src/Display/GridPlans.c.gtk GabeditSrc239/src/Display/GridPlans.c --- GabeditSrc239/src/Display/GridPlans.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/GridPlans.c 2011-07-18 20:59:26.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 GabeditSrc239/src/Display/GridQChem.c.gtk GabeditSrc239/src/Display/GridQChem.c --- GabeditSrc239/src/Display/GridQChem.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/GridQChem.c 2011-07-18 20:59:26.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(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 GabeditSrc239/src/Display/IntegralOrbitals.c.gtk GabeditSrc239/src/Display/IntegralOrbitals.c --- GabeditSrc239/src/Display/IntegralOrbitals.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/IntegralOrbitals.c 2011-07-19 19:05:40.000000000 +0200 @@ -1337,13 +1337,13 @@ void coulomb_orbitals_dlg() button = create_button(Win,_("OK")); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_coulomb_orbitals,G_OBJECT(Win)); button = create_button(Win,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win)); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win)); @@ -1919,13 +1919,13 @@ void transition_matrix_orbitals_dlg() button = create_button(Win,_("OK")); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_transition_matrix,G_OBJECT(Win)); button = create_button(Win,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win)); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win)); @@ -2400,13 +2400,13 @@ void spatial_overlap_orbitals_dlg() button = create_button(Win,_("OK")); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_spatial_overlap,G_OBJECT(Win)); button = create_button(Win,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win)); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win)); @@ -2480,13 +2480,13 @@ static GtkWidget* showCalculatedChargesD button = create_button(dlgWin,_("Partial charges of molecule <= Calculated 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)setPartialChargesToCalculated, 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)destroyCalculatedChargesDlg, GTK_OBJECT(dlgWin)); @@ -2678,13 +2678,13 @@ static GtkWidget* showCalculatedBondOrde button = create_button(dlgWin,_("Multiple bonds <= Calculated bondOrders")); 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)setBondOrdersToCalculated, 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)destroyCalculatedBondOrdersDlg, GTK_OBJECT(dlgWin)); diff -up GabeditSrc239/src/Display/LabelsGL.c.gtk GabeditSrc239/src/Display/LabelsGL.c --- GabeditSrc239/src/Display/LabelsGL.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/LabelsGL.c 2011-07-18 20:59:26.000000000 +0200 @@ -732,19 +732,19 @@ void set_title_dlg() button = create_button(Win,_("OK")); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_set_title_close,G_OBJECT(Win)); button = create_button(Win,_("Apply")); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_set_title,G_OBJECT(Win)); button = create_button(Win,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win)); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win)); diff -up GabeditSrc239/src/Display/MenuToolBarGL.c.gtk GabeditSrc239/src/Display/MenuToolBarGL.c --- GabeditSrc239/src/Display/MenuToolBarGL.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/MenuToolBarGL.c 2011-07-18 20:59:26.000000000 +0200 @@ -2022,7 +2022,7 @@ static void add_widget (GtkUIManager *me toolbar = GTK_TOOLBAR (widget); gtk_toolbar_set_show_arrow (toolbar, TRUE); gtk_toolbar_set_style(toolbar, GTK_TOOLBAR_ICONS); - gtk_toolbar_set_orientation(toolbar, GTK_ORIENTATION_VERTICAL); + gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_VERTICAL); toolBar = toolbar; handleBoxToolBar = handlebox; } diff -up GabeditSrc239/src/Display/Orbitals.c.gtk GabeditSrc239/src/Display/Orbitals.c --- GabeditSrc239/src/Display/Orbitals.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/Orbitals.c 2011-07-18 20:59:26.000000000 +0200 @@ -469,7 +469,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)); @@ -477,7 +477,7 @@ static void cut_ceof_orbitals_win(GtkWid button = create_button(Win,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)applycutoff,GTK_OBJECT(Win)); @@ -1054,7 +1054,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)); @@ -1062,7 +1062,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)); @@ -1163,7 +1163,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); @@ -1190,7 +1190,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 GabeditSrc239/src/Display/OrbitalsMolpro.c.gtk GabeditSrc239/src/Display/OrbitalsMolpro.c --- GabeditSrc239/src/Display/OrbitalsMolpro.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/OrbitalsMolpro.c 2011-07-18 20:59:26.000000000 +0200 @@ -1738,14 +1738,14 @@ void create_window_list_orbitals(GtkWidg gtk_widget_realize(fp); button = create_button(fp,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(fp)); gtk_widget_show (button); button = create_button(fp,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_object_set_data(G_OBJECT (button), "Window", fp); diff -up GabeditSrc239/src/Display/PlanesMapped.c.gtk GabeditSrc239/src/Display/PlanesMapped.c --- GabeditSrc239/src/Display/PlanesMapped.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/PlanesMapped.c 2011-07-18 20:59:26.000000000 +0200 @@ -173,7 +173,7 @@ void create_maps(gchar* title,gint type) gtk_widget_realize(Win); button = create_button(Win,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win)); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win)); @@ -181,7 +181,7 @@ void create_maps(gchar* title,gint type) button = create_button(Win,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_maps,GTK_OBJECT(Win)); @@ -279,14 +279,14 @@ void create_maps_plane(gchar* title) gtk_widget_realize(Win); button = create_button(Win,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win)); gtk_widget_show (button); button = create_button(Win,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_maps_plane,GTK_OBJECT(Win)); diff -up GabeditSrc239/src/Display/PovrayGL.c.gtk GabeditSrc239/src/Display/PovrayGL.c --- GabeditSrc239/src/Display/PovrayGL.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/PovrayGL.c 2011-07-18 20:59:26.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_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 GabeditSrc239/src/Display/PreferencesOrb.c.gtk GabeditSrc239/src/Display/PreferencesOrb.c --- GabeditSrc239/src/Display/PreferencesOrb.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/PreferencesOrb.c 2011-07-18 20:59:26.000000000 +0200 @@ -150,14 +150,14 @@ void set_colors_surfaces(gchar* title) gtk_widget_realize(Win); button = create_button(Win,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_selectors_window,GTK_OBJECT(Win)); gtk_widget_show_all (button); button = create_button(Win,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show_all (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_colorselections,GTK_OBJECT(Win)); @@ -506,20 +506,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); @@ -562,14 +562,14 @@ void set_light_positions(gchar* title) gtk_widget_realize(Win); button = create_button(Win,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_setlight_window, GTK_OBJECT(Win)); gtk_widget_show (button); button = create_button(Win,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_ligth_positions,GTK_OBJECT(Win)); diff -up GabeditSrc239/src/Display/UtilsOrb.c.gtk GabeditSrc239/src/Display/UtilsOrb.c --- GabeditSrc239/src/Display/UtilsOrb.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/UtilsOrb.c 2011-07-18 20:59:26.000000000 +0200 @@ -1147,7 +1147,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)); @@ -1155,7 +1155,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)); @@ -1362,7 +1362,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)); @@ -1370,7 +1370,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)); @@ -2039,7 +2039,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)); @@ -2047,7 +2047,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)); @@ -2165,19 +2165,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)); @@ -2209,7 +2209,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(GTK_WIDGET(handleBoxColorMapGrid))) { gtk_widget_hide(handleBoxColorMapGrid); gtk_widget_show(handleBoxColorMapGrid); @@ -2240,7 +2240,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(GTK_WIDGET(handleBoxColorMapPlanesMapped))) { gtk_widget_hide(handleBoxColorMapPlanesMapped); gtk_widget_show(handleBoxColorMapPlanesMapped); @@ -2273,7 +2273,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(GTK_WIDGET(handleBoxColorMapContours))) { gtk_widget_hide(handleBoxColorMapContours); gtk_widget_show(handleBoxColorMapContours); diff -up GabeditSrc239/src/Display/Vibration.c.gtk GabeditSrc239/src/Display/Vibration.c --- GabeditSrc239/src/Display/Vibration.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Display/Vibration.c 2011-07-18 20:59:26.000000000 +0200 @@ -644,7 +644,7 @@ static void add_cancel_ok_button(GtkWid gtk_widget_realize(Win); button = create_button(Win,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, GTK_OBJECT(Win)); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Win)); @@ -652,7 +652,7 @@ static void add_cancel_ok_button(GtkWid button = create_button(Win,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)myFunc,GTK_OBJECT(Win)); diff -up GabeditSrc239/src/Files/FileChooser.c.gtk GabeditSrc239/src/Files/FileChooser.c --- GabeditSrc239/src/Files/FileChooser.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Files/FileChooser.c 2011-07-18 20:59:26.000000000 +0200 @@ -503,14 +503,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 */ @@ -518,7 +518,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 GabeditSrc239/src/Files/ListeFiles.c.gtk GabeditSrc239/src/Files/ListeFiles.c --- GabeditSrc239/src/Files/ListeFiles.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Files/ListeFiles.c 2011-07-18 20:59:26.000000000 +0200 @@ -534,7 +534,7 @@ static void create_info_win() gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE); button = create_button(fp,"OK"); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp)); @@ -879,14 +879,14 @@ static void create_set_dialogue_window() hbox = create_hbox(vboxwin); button = create_button(fp,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp)); gtk_widget_show (button); button = create_button(fp,"OK"); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_object_set_data(G_OBJECT(fp),"Entrys",entrys); @@ -2477,14 +2477,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 GabeditSrc239/src/FireFly/FireFly.c.gtk GabeditSrc239/src/FireFly/FireFly.c --- GabeditSrc239/src/FireFly/FireFly.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/FireFly/FireFly.c 2011-07-18 20:59:26.000000000 +0200 @@ -198,7 +198,7 @@ static void fireflyInputFileWindow(gbool button = create_button(Wins,_("Cancel")); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); button = create_button(Wins,_("OK")); @@ -223,7 +223,7 @@ static void fireflyInputFileWindow(gbool gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins)); diff -up GabeditSrc239/src/Gamess/Gamess.c.gtk GabeditSrc239/src/Gamess/Gamess.c --- GabeditSrc239/src/Gamess/Gamess.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Gamess/Gamess.c 2011-07-18 20:59:26.000000000 +0200 @@ -181,7 +181,7 @@ static void gamessInputFileWindow(gboole button = create_button(Wins,_("Cancel")); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); button = create_button(Wins,_("OK")); @@ -206,7 +206,7 @@ static void gamessInputFileWindow(gboole gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins)); diff -up GabeditSrc239/src/Gaussian/Gaussian.c.gtk GabeditSrc239/src/Gaussian/Gaussian.c --- GabeditSrc239/src/Gaussian/Gaussian.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Gaussian/Gaussian.c 2011-07-18 20:59:26.000000000 +0200 @@ -1131,12 +1131,12 @@ void insert_gaussian(gint itype) button = create_button(Wins,"Cancel"); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(to_cancel_win),GTK_OBJECT(Wins)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); button = create_button(Wins,"OK"); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect(G_OBJECT(button), "clicked", (GCallback)GetInfoAll,NULL); @@ -1198,7 +1198,7 @@ void gauss(gint ioption) gtk_box_set_homogeneous (GTK_BOX( GTK_DIALOG(Wins)->action_area), TRUE); button = create_button(Wins,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(G_OBJECT(button),"clicked",G_CALLBACK(to_cancel_win),GTK_OBJECT(Wins)); gtk_widget_show (button); @@ -1206,7 +1206,7 @@ void gauss(gint ioption) button = create_button(Wins,_("OK")); g_signal_connect(G_OBJECT(button), "clicked", (GCallback)putInfoAll,NULL); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); diff -up GabeditSrc239/src/Gaussian/GInterfaceBasis.c.gtk GabeditSrc239/src/Gaussian/GInterfaceBasis.c --- GabeditSrc239/src/Gaussian/GInterfaceBasis.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Gaussian/GInterfaceBasis.c 2011-07-18 20:59:26.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); 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 GabeditSrc239/src/Geometry/BuildLinear.c.gtk GabeditSrc239/src/Geometry/BuildLinear.c --- GabeditSrc239/src/Geometry/BuildLinear.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/BuildLinear.c 2011-07-18 20:59:26.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 GabeditSrc239/src/Geometry/BuildNanoTube.c.gtk GabeditSrc239/src/Geometry/BuildNanoTube.c --- GabeditSrc239/src/Geometry/BuildNanoTube.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/BuildNanoTube.c 2011-07-18 20:59:26.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 GabeditSrc239/src/Geometry/BuildPolyNucleicAcid.c.gtk GabeditSrc239/src/Geometry/BuildPolyNucleicAcid.c --- GabeditSrc239/src/Geometry/BuildPolyNucleicAcid.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/BuildPolyNucleicAcid.c 2011-07-18 20:59:26.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 GabeditSrc239/src/Geometry/BuildPolyPeptide.c.gtk GabeditSrc239/src/Geometry/BuildPolyPeptide.c --- GabeditSrc239/src/Geometry/BuildPolyPeptide.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/BuildPolyPeptide.c 2011-07-18 20:59:26.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 GabeditSrc239/src/Geometry/BuildPolySaccharide.c.gtk GabeditSrc239/src/Geometry/BuildPolySaccharide.c --- GabeditSrc239/src/Geometry/BuildPolySaccharide.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/BuildPolySaccharide.c 2011-07-18 20:59:26.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 GabeditSrc239/src/Geometry/BuildRing.c.gtk GabeditSrc239/src/Geometry/BuildRing.c --- GabeditSrc239/src/Geometry/BuildRing.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/BuildRing.c 2011-07-18 20:59:26.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 GabeditSrc239/src/Geometry/BuildRoZPhi.c.gtk GabeditSrc239/src/Geometry/BuildRoZPhi.c --- GabeditSrc239/src/Geometry/BuildRoZPhi.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/BuildRoZPhi.c 2011-07-18 20:59:26.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 GabeditSrc239/src/Geometry/DrawGeomCairo.c.gtk GabeditSrc239/src/Geometry/DrawGeomCairo.c --- GabeditSrc239/src/Geometry/DrawGeomCairo.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/DrawGeomCairo.c 2011-07-18 20:59:26.000000000 +0200 @@ -26,6 +26,8 @@ DEALINGS IN THE SOFTWARE. #include <cairo-pdf.h> #include <cairo-ps.h> #include <cairo-svg.h> +#include <gdk/gdk.h> +#include <gtk/gtk.h> #include "../Common/Global.h" #include "../Utils/Constants.h" @@ -2834,13 +2836,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 +2935,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 +3059,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 +3195,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 +3275,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 +6146,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 +6195,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 GabeditSrc239/src/Geometry/EnergiesCurves.c.gtk GabeditSrc239/src/Geometry/EnergiesCurves.c --- GabeditSrc239/src/Geometry/EnergiesCurves.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/EnergiesCurves.c 2011-07-18 20:59:26.000000000 +0200 @@ -21,6 +21,7 @@ DEALINGS IN THE SOFTWARE. #include <gtk/gtk.h> #include <stdlib.h> #include <stdio.h> +#include <gdk/gdk.h> #include "../Common/Global.h" #include "ResultsAnalise.h" @@ -157,7 +158,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, @@ -182,7 +183,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, @@ -684,20 +685,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 GabeditSrc239/src/Geometry/GeomXYZ.c.gtk GabeditSrc239/src/Geometry/GeomXYZ.c --- GabeditSrc239/src/Geometry/GeomXYZ.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/GeomXYZ.c 2011-07-18 20:59: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); @@ -12502,7 +12502,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)); @@ -12512,7 +12512,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); @@ -12780,14 +12780,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); @@ -12847,13 +12847,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); @@ -12953,13 +12953,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 GabeditSrc239/src/Geometry/GeomZmatrix.c.gtk GabeditSrc239/src/Geometry/GeomZmatrix.c --- GabeditSrc239/src/Geometry/GeomZmatrix.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/GeomZmatrix.c 2011-07-18 20:59:26.000000000 +0200 @@ -2433,7 +2433,7 @@ void create_window_save_zmat() 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)); @@ -2443,7 +2443,7 @@ 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); g_free(labelt); g_free(fileName); @@ -2696,14 +2696,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); @@ -2938,14 +2938,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); @@ -3656,13 +3656,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); @@ -3855,13 +3855,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); @@ -3914,14 +3914,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); @@ -6975,14 +6975,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); @@ -7040,13 +7040,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); @@ -7147,13 +7147,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 GabeditSrc239/src/Geometry/ImagesGeom.c.gtk GabeditSrc239/src/Geometry/ImagesGeom.c --- GabeditSrc239/src/Geometry/ImagesGeom.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/ImagesGeom.c 2011-07-18 20:59:26.000000000 +0200 @@ -19,6 +19,8 @@ DEALINGS IN THE SOFTWARE. #include "../../Config.h" +#include <gdk/gdk.h> + #include "../Common/Global.h" #include "../Geometry/GeomGlobal.h" #include "../Geometry/Fragments.h" diff -up GabeditSrc239/src/Geometry/MenuToolBarGeom.c.gtk GabeditSrc239/src/Geometry/MenuToolBarGeom.c --- GabeditSrc239/src/Geometry/MenuToolBarGeom.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/MenuToolBarGeom.c 2011-07-18 20:59:26.000000000 +0200 @@ -21,6 +21,7 @@ DEALINGS IN THE SOFTWARE. #include "../../Config.h" #include <stdlib.h> #include <math.h> +#include <gtk/gtk.h> #include "../Common/Global.h" #include "../Utils/UtilsInterface.h" diff -up GabeditSrc239/src/Geometry/OpenBabel.c.gtk GabeditSrc239/src/Geometry/OpenBabel.c --- GabeditSrc239/src/Geometry/OpenBabel.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/OpenBabel.c 2011-07-18 20:59:26.000000000 +0200 @@ -701,7 +701,7 @@ void create_babel_dialogue() - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); @@ -888,13 +888,13 @@ GtkWidget* create_babel_read_save_dialog g_object_set_data (G_OBJECT (fp), "EntryFileName", entry); g_object_set_data (G_OBJECT (fp), "EntryCombo", entryCombo); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); button = create_button(fp,"Cancel"); gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 2); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(delete_child),G_OBJECT(fp)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); combo = g_object_get_data (G_OBJECT (frame), "Combo"); g_signal_connect_swapped(G_OBJECT(GTK_COMBO_BOX(combo)), "changed",G_CALLBACK(changed_type), entry); diff -up GabeditSrc239/src/Geometry/PersonalFragments.c.gtk GabeditSrc239/src/Geometry/PersonalFragments.c --- GabeditSrc239/src/Geometry/PersonalFragments.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/PersonalFragments.c 2011-07-18 20:59:26.000000000 +0200 @@ -268,12 +268,12 @@ void newGroupeDlg(gpointer data, guint O Button = create_button(WinDlg,_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,_("OK")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)addGroupe,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); @@ -407,12 +407,12 @@ void deleteGroupeDlg(gpointer data, guin Button = create_button(WinDlg,_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,_("OK")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)deleteOneGroupe,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); @@ -676,12 +676,12 @@ void addFragmentDlg(gpointer data, guint Button = create_button(WinDlg,_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,_("OK")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)addFragment,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); @@ -869,12 +869,12 @@ void deleteFragmentDlg(gpointer data, gu Button = create_button(WinDlg,_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,_("OK")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)deleteOneFragment,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); diff -up GabeditSrc239/src/Geometry/Povray.c.gtk GabeditSrc239/src/Geometry/Povray.c --- GabeditSrc239/src/Geometry/Povray.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/Povray.c 2011-07-18 20:59:26.000000000 +0200 @@ -1280,19 +1280,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 GabeditSrc239/src/Geometry/PreviewGeom.c.gtk GabeditSrc239/src/Geometry/PreviewGeom.c --- GabeditSrc239/src/Geometry/PreviewGeom.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/PreviewGeom.c 2011-07-18 20:59:26.000000000 +0200 @@ -21,6 +21,7 @@ DEALINGS IN THE SOFTWARE. #include "../../Config.h" #include <stdlib.h> #include <math.h> +#include <gdk/gdk.h> #include "../Common/Global.h" #include "../Utils/Constants.h" @@ -729,7 +730,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 +903,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 GabeditSrc239/src/Geometry/ResultsAnalise.c.gtk GabeditSrc239/src/Geometry/ResultsAnalise.c --- GabeditSrc239/src/Geometry/ResultsAnalise.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/ResultsAnalise.c 2011-07-18 20:59:26.000000000 +0200 @@ -2756,7 +2756,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); @@ -2764,25 +2764,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")); @@ -2819,7 +2819,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", @@ -2829,7 +2829,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); @@ -2837,7 +2837,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); @@ -2845,7 +2845,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 GabeditSrc239/src/Geometry/SelectionDlg.c.gtk GabeditSrc239/src/Geometry/SelectionDlg.c --- GabeditSrc239/src/Geometry/SelectionDlg.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/SelectionDlg.c 2011-07-18 20:59:26.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); 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(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); @@ -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(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); @@ -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); 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); @@ -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(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); @@ -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(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); @@ -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(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); @@ -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); 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_widget_show_all(winDlg); diff -up GabeditSrc239/src/Geometry/Symmetry.c.gtk GabeditSrc239/src/Geometry/Symmetry.c --- GabeditSrc239/src/Geometry/Symmetry.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Geometry/Symmetry.c 2011-07-18 20:59:26.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 GabeditSrc239/src/Molcas/MolcasBasis.c.gtk GabeditSrc239/src/Molcas/MolcasBasis.c --- GabeditSrc239/src/Molcas/MolcasBasis.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Molcas/MolcasBasis.c 2011-07-18 20:59:26.000000000 +0200 @@ -460,7 +460,7 @@ GtkWidget* createMolcasBasisWindow() button = create_button(dlgWin,_("Cancel")); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dlgWin)->action_area), button, FALSE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(destroy_children),GTK_OBJECT(dlgWin)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); /* for(i=0;i<NHBOX;i++) BoiteHP[i] = NULL; @@ -468,7 +468,7 @@ GtkWidget* createMolcasBasisWindow() */ button = create_button(dlgWin,"OK"); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dlgWin)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(destroy_children),GTK_OBJECT(dlgWin)); diff -up GabeditSrc239/src/Molcas/MolcasBasisLibrary.c.gtk GabeditSrc239/src/Molcas/MolcasBasisLibrary.c --- GabeditSrc239/src/Molcas/MolcasBasisLibrary.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Molcas/MolcasBasisLibrary.c 2011-07-18 20:59:26.000000000 +0200 @@ -808,13 +808,13 @@ static void newAtomDlg() Button = create_button(WinDlg,"Cancel"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,"OK"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)newAtom,GTK_OBJECT(WinDlg)); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); @@ -1001,13 +1001,13 @@ static void newBasisDlg() Button = create_button(WinDlg,"Cancel"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,"OK"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)newBasis,GTK_OBJECT(WinDlg)); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); @@ -1189,13 +1189,13 @@ static void editBasisDlg() Button = create_button(WinDlg,"Cancel"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,"OK"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)editBasis,GTK_OBJECT(WinDlg)); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); diff -up GabeditSrc239/src/Molcas/Molcas.c.gtk GabeditSrc239/src/Molcas/Molcas.c --- GabeditSrc239/src/Molcas/Molcas.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Molcas/Molcas.c 2011-07-18 20:59:26.000000000 +0200 @@ -188,7 +188,7 @@ static void molcasInputFileWindow(gboole button = create_button(Wins,_("Cancel")); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); @@ -213,7 +213,7 @@ static void molcasInputFileWindow(gboole createScfFrame(Wins, hbox, button); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins)); diff -up GabeditSrc239/src/Molcas/MolcasGateWay.c.gtk GabeditSrc239/src/Molcas/MolcasGateWay.c --- GabeditSrc239/src/Molcas/MolcasGateWay.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Molcas/MolcasGateWay.c 2011-07-18 20:59:26.000000000 +0200 @@ -1555,7 +1555,7 @@ static void createViewInfoAbelianGroupWi Bouton = create_button(Dialogue,"OK"); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dialogue)->action_area), Bouton, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Bouton, TRUE); gtk_widget_grab_default(Bouton); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(Dialogue)); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue)); diff -up GabeditSrc239/src/MolecularMechanics/MolecularMechanicsDlg.c.gtk GabeditSrc239/src/MolecularMechanics/MolecularMechanicsDlg.c --- GabeditSrc239/src/MolecularMechanics/MolecularMechanicsDlg.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/MolecularMechanics/MolecularMechanicsDlg.c 2011-07-18 20:59:26.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); button = create_button(Win,"Ok"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)amberEnergyCalculation,GTK_OBJECT(Win)); gtk_widget_show (button); @@ -3993,13 +3993,13 @@ void MolecularMechanicsMinimizeDlg() gtk_widget_realize(Win); button = create_button(Win,"Cancel"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(DestroyWinMMDlg),GTK_OBJECT(Win)); gtk_widget_show (button); button = create_button(Win,"Ok"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)amberMinimize,GTK_OBJECT(Win)); gtk_widget_show (button); @@ -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( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win)); gtk_widget_show (button); button = create_button(Win,"Ok"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)amberMolecularDynamics,GTK_OBJECT(Win)); gtk_widget_show (button); @@ -4084,13 +4084,13 @@ void MolecularMechanicsDynamicsConfoDlg( gtk_widget_realize(Win); button = create_button(Win,"Cancel"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win)); gtk_widget_show (button); button = create_button(Win,"Ok"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)amberMolecularDynamicsConfo,GTK_OBJECT(Win)); gtk_widget_show (button); diff -up GabeditSrc239/src/MolecularMechanics/SetMMParameters.c.gtk GabeditSrc239/src/MolecularMechanics/SetMMParameters.c --- GabeditSrc239/src/MolecularMechanics/SetMMParameters.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/MolecularMechanics/SetMMParameters.c 2011-07-18 20:59:26.000000000 +0200 @@ -20,6 +20,7 @@ DEALINGS IN THE SOFTWARE. #include <stdlib.h> #include <stdio.h> #include <math.h> +#include <gtk/gtk.h> #include "../Common/Global.h" #include "../Utils/AtomsProp.h" @@ -1020,14 +1021,14 @@ static void editnewPairWiseDlg(GabeditSi Button = create_button(WinDlg,"Cancel"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,"OK"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); gtk_widget_show_all(WinDlg); @@ -1150,14 +1151,14 @@ static void editnewNonBondedDlg(GabeditS Button = create_button(WinDlg,"Cancel"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,"OK"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); gtk_widget_show_all(WinDlg); @@ -1348,7 +1349,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 +1357,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 +1566,14 @@ static void editnewImproperDlg(GabeditSi Button = create_button(WinDlg,"Cancel"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,"OK"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); gtk_widget_show_all(WinDlg); @@ -1832,14 +1833,14 @@ static void editnewTorsionDlg(GabeditSig Button = create_button(WinDlg,"Cancel"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,"OK"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); gtk_widget_show_all(WinDlg); @@ -2021,14 +2022,14 @@ static void editnewBendDlg(GabeditSignal Button = create_button(WinDlg,"Cancel"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,"OK"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); gtk_widget_show_all(WinDlg); @@ -2190,13 +2191,13 @@ static void editnewBondDlg(GabeditSignal Button = create_button(WinDlg,"Cancel"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,"OK"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f,NULL); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); @@ -2371,13 +2372,13 @@ static void editnewTypeDlg(GabeditSignal Button = create_button(WinDlg,"Cancel"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,"OK"); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect(G_OBJECT(Button), "clicked",(GCallback)f, NULL); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); diff -up GabeditSrc239/src/MolecularMechanics/SetPDBTemplate.c.gtk GabeditSrc239/src/MolecularMechanics/SetPDBTemplate.c --- GabeditSrc239/src/MolecularMechanics/SetPDBTemplate.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/MolecularMechanics/SetPDBTemplate.c 2011-07-18 20:59:26.000000000 +0200 @@ -513,12 +513,12 @@ static void editnewDlg(GabeditSignalFunc Button = create_button(WinDlg,_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,_("OK")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(GTK_OBJECT(Button), "clicked",(GCallback)f,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); diff -up GabeditSrc239/src/Molpro/MInterfaceBasis.c.gtk GabeditSrc239/src/Molpro/MInterfaceBasis.c --- GabeditSrc239/src/Molpro/MInterfaceBasis.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Molpro/MInterfaceBasis.c 2011-07-18 20:59:26.000000000 +0200 @@ -964,14 +964,14 @@ static void DialogueDelete(GtkWidget *w) Bouton = create_button(Dialogue,"No"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue)); - GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Bouton, TRUE); gtk_widget_grab_default(Bouton); Bouton = create_button(Dialogue,"Yes"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0); g_signal_connect(G_OBJECT(Bouton), "clicked",(GCallback)DelAtomList, NULL); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue)); - GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Bouton, TRUE); gtk_widget_show_all(Dialogue); } @@ -1077,7 +1077,7 @@ static void DialogueAdd(GtkWidget *w,gpo button = create_button(FenetreTable,_("Cancel")); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child,GTK_OBJECT(FenetreTable)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show(button); diff -up GabeditSrc239/src/Molpro/MolproBasisLibrary.c.gtk GabeditSrc239/src/Molpro/MolproBasisLibrary.c --- GabeditSrc239/src/Molpro/MolproBasisLibrary.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Molpro/MolproBasisLibrary.c 2011-07-18 20:59:26.000000000 +0200 @@ -824,13 +824,13 @@ static void newAtomDlg() Button = create_button(WinDlg,_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,_("OK")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)newAtom,GTK_OBJECT(WinDlg)); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); @@ -958,13 +958,13 @@ static void newBasisDlg() Button = create_button(WinDlg,"Cancel"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,_("OK")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)newBasis,GTK_OBJECT(WinDlg)); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); diff -up GabeditSrc239/src/Molpro/Molpro.c.gtk GabeditSrc239/src/Molpro/Molpro.c --- GabeditSrc239/src/Molpro/Molpro.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Molpro/Molpro.c 2011-07-18 20:59:26.000000000 +0200 @@ -704,12 +704,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); @@ -749,14 +749,14 @@ void molpro() gtk_widget_realize(Wins); button = create_button(Wins,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( to_cancel_win),GTK_OBJECT(Wins)); gtk_widget_show (button); /* button = create_button(Wins,"SAVE&CLOSE"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, TRUE, TRUE, 0); g_signal_connect(G_OBJECT(button), "clicked",(GCallback)GetInfo,&iframe); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(destroy_children),GTK_OBJECT(Wins)); @@ -767,7 +767,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 GabeditSrc239/src/Mopac/Mopac.c.gtk GabeditSrc239/src/Mopac/Mopac.c --- GabeditSrc239/src/Mopac/Mopac.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Mopac/Mopac.c 2011-07-18 20:59:26.000000000 +0200 @@ -175,7 +175,7 @@ static void mopacInputFileWindow(gboolea button = create_button(Wins,_("Cancel")); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); button = create_button(Wins,_("OK")); @@ -196,7 +196,7 @@ static void mopacInputFileWindow(gboolea gtk_widget_set_sensitive(hbox, FALSE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins)); diff -up GabeditSrc239/src/MPQC/MPQCBasisLibrary.c.gtk GabeditSrc239/src/MPQC/MPQCBasisLibrary.c --- GabeditSrc239/src/MPQC/MPQCBasisLibrary.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/MPQC/MPQCBasisLibrary.c 2011-07-18 20:59:26.000000000 +0200 @@ -778,13 +778,13 @@ static void newAtomDlg() Button = create_button(WinDlg,_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,_("OK")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)newAtom,GTK_OBJECT(WinDlg)); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); @@ -915,13 +915,13 @@ static void newBasisDlg() Button = create_button(WinDlg,_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,_("OK")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)newBasis,GTK_OBJECT(WinDlg)); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); @@ -1034,13 +1034,13 @@ static void editBasisDlg() Button = create_button(WinDlg,_("Cancel")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); Button = create_button(WinDlg,_("OK")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(WinDlg)->action_area), Button,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)editBasis,GTK_OBJECT(WinDlg)); g_signal_connect_swapped(G_OBJECT(Button), "clicked", (GCallback)gtk_widget_destroy,GTK_OBJECT(WinDlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); diff -up GabeditSrc239/src/MPQC/MPQC.c.gtk GabeditSrc239/src/MPQC/MPQC.c --- GabeditSrc239/src/MPQC/MPQC.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/MPQC/MPQC.c 2011-07-18 20:59:26.000000000 +0200 @@ -192,7 +192,7 @@ static void mpqcInputFileWindow(gboolean button = create_button(Wins,_("Cancel")); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); button = create_button(Wins,"OK"); @@ -220,7 +220,7 @@ static void mpqcInputFileWindow(gboolean createMPQCProperties(hbox); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins)); diff -up GabeditSrc239/src/MPQC/MPQCFunctionals.c.gtk GabeditSrc239/src/MPQC/MPQCFunctionals.c --- GabeditSrc239/src/MPQC/MPQCFunctionals.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/MPQC/MPQCFunctionals.c 2011-07-18 20:59:26.000000000 +0200 @@ -574,7 +574,7 @@ void mpqcSumDensityFunctionalWindow() button = create_button(win,_("OK")); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(win)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(setSumDensityFunctionals),GTK_OBJECT(win)); @@ -583,7 +583,7 @@ void mpqcSumDensityFunctionalWindow() button = create_button(win,_("Close")); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(win)->action_area), button, FALSE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK(destroy_children),GTK_OBJECT(win)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); gtk_widget_show_all(win); diff -up GabeditSrc239/src/NetWork/Batch.c.gtk GabeditSrc239/src/NetWork/Batch.c --- GabeditSrc239/src/NetWork/Batch.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/NetWork/Batch.c 2011-07-18 20:59:26.000000000 +0200 @@ -355,14 +355,14 @@ static void create_kill_batch(GtkWidget* gtk_widget_realize(fp); button = create_button(fp,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp)); gtk_widget_show (button); button = create_button(fp,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)kill_batch,GTK_OBJECT(Win)); @@ -669,14 +669,14 @@ void create_batch_remote(gboolean all) gtk_widget_realize(fp); button = create_button(fp,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp)); gtk_widget_show (button); button = create_button(fp,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT (EntryPassWord ), "activate", (GCallback) gtk_button_clicked, GTK_OBJECT (button)); @@ -839,7 +839,7 @@ static GtkWidget* create_list_result_com gtk_widget_realize(Win); button = create_button(Win,_("OK")); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_win_user_batch,GTK_OBJECT(Win)); gtk_widget_show (button); diff -up GabeditSrc239/src/NetWork/Process.c.gtk GabeditSrc239/src/NetWork/Process.c --- GabeditSrc239/src/NetWork/Process.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/NetWork/Process.c 2011-07-18 20:59:26.000000000 +0200 @@ -482,14 +482,14 @@ void create_process_remote(gboolean all) gtk_widget_realize(fp); button = create_button(fp,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp)); gtk_widget_show (button); button = create_button(fp,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT (EntryPassWord ), "activate", (GCallback) gtk_button_clicked, GTK_OBJECT (button)); @@ -720,14 +720,14 @@ static void create_kill_process(GtkWidge gtk_widget_realize(fp); button = create_button(fp,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,GTK_OBJECT(fp)); gtk_widget_show (button); button = create_button(fp,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)kill_process,GTK_OBJECT(Win)); @@ -1102,7 +1102,7 @@ static GtkWidget* create_list_result_com gtk_widget_realize(Win); button = create_button(Win,_("OK")); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_win_user_process,GTK_OBJECT(Win)); gtk_widget_show (button); diff -up GabeditSrc239/src/NWChem/NWChem.c.gtk GabeditSrc239/src/NWChem/NWChem.c --- GabeditSrc239/src/NWChem/NWChem.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/NWChem/NWChem.c 2011-07-19 19:08:09.000000000 +0200 @@ -175,7 +175,7 @@ static void nwchemInputFileWindow(gboole button = create_button(Wins,_("Cancel")); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); button = create_button(Wins,_("OK")); @@ -195,7 +195,7 @@ static void nwchemInputFileWindow(gboole gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins)); diff -up GabeditSrc239/src/Orca/OrcaBasis.c.gtk GabeditSrc239/src/Orca/OrcaBasis.c --- GabeditSrc239/src/Orca/OrcaBasis.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Orca/OrcaBasis.c 2011-07-18 20:59:26.000000000 +0200 @@ -19,6 +19,7 @@ DEALINGS IN THE SOFTWARE. #include <stdlib.h> #include <ctype.h> +#include <gtk/gtk.h> #include "../../Config.h" #include "../Common/Global.h" diff -up GabeditSrc239/src/Orca/Orca.c.gtk GabeditSrc239/src/Orca/Orca.c --- GabeditSrc239/src/Orca/Orca.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Orca/Orca.c 2011-07-18 20:59:26.000000000 +0200 @@ -174,7 +174,7 @@ static void orcaInputFileWindow(gboolean button = create_button(Wins,_("Cancel")); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); button = create_button(Wins,_("OK")); @@ -194,7 +194,7 @@ static void orcaInputFileWindow(gboolean gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins)); diff -up GabeditSrc239/src/QChem/QChem.c.gtk GabeditSrc239/src/QChem/QChem.c --- GabeditSrc239/src/QChem/QChem.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/QChem/QChem.c 2011-07-18 20:59:26.000000000 +0200 @@ -181,7 +181,7 @@ static void qchemInputFileWindow(gboolea button = create_button(Wins,_("Cancel")); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked", G_CALLBACK( toCancelWin),GTK_OBJECT(Wins)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_show (button); button = create_button(Wins,_("OK")); @@ -201,7 +201,7 @@ static void qchemInputFileWindow(gboolea gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Wins)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",G_CALLBACK(putInfoInTextEditor),GTK_OBJECT(Wins)); diff -up GabeditSrc239/src/SemiEmpirical/SemiEmpiricalDlg.c.gtk GabeditSrc239/src/SemiEmpirical/SemiEmpiricalDlg.c --- GabeditSrc239/src/SemiEmpirical/SemiEmpiricalDlg.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/SemiEmpirical/SemiEmpiricalDlg.c 2011-07-18 20:59:26.000000000 +0200 @@ -2458,13 +2458,13 @@ void semiEmpiricalDlg(gchar* type) gtk_widget_realize(Win); button = create_button(Win,"Cancel"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win)); gtk_widget_show (button); button = create_button(Win,"Ok"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); if(!strcmp(type,"AM1FireFlyEnergy")) g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)runAM1FireFlyEnergy,GTK_OBJECT(Win)); @@ -5380,13 +5380,13 @@ void semiEmpiricalMolecularDynamicsDlg() gtk_widget_realize(Win); button = create_button(Win,"Cancel"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win)); gtk_widget_show (button); button = create_button(Win,"Ok"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)semiEmpiricalMD,GTK_OBJECT(Win)); gtk_widget_show (button); @@ -5424,13 +5424,13 @@ void semiEmpiricalMolecularDynamicsConfo gtk_widget_realize(Win); button = create_button(Win,"Cancel"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(gtk_widget_destroy),GTK_OBJECT(Win)); gtk_widget_show (button); button = create_button(Win,"Ok"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(Win)->action_area), button, TRUE, TRUE, 0); g_signal_connect_swapped(GTK_OBJECT(button), "clicked", (GCallback)semiEmpiricalMDConfo,GTK_OBJECT(Win)); gtk_widget_show (button); diff -up GabeditSrc239/src/Spectrum/ECDSpectrum.c.gtk GabeditSrc239/src/Spectrum/ECDSpectrum.c --- GabeditSrc239/src/Spectrum/ECDSpectrum.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Spectrum/ECDSpectrum.c 2011-07-18 20:59:26.000000000 +0200 @@ -680,14 +680,14 @@ static gboolean read_qchem_file_multiple gtk_widget_show(hbox); button = create_button(window,"Cancel"); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(window)); gtk_widget_show_all (button); button = create_button(window,"OK"); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show_all (button); g_object_set_data(G_OBJECT (button), "Window", window); diff -up GabeditSrc239/src/Spectrum/UVSpectrum.c.gtk GabeditSrc239/src/Spectrum/UVSpectrum.c --- GabeditSrc239/src/Spectrum/UVSpectrum.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Spectrum/UVSpectrum.c 2011-07-18 20:59:26.000000000 +0200 @@ -703,14 +703,14 @@ static gboolean read_qchem_file_multiple gtk_widget_show(hbox); button = create_button(window,_("Cancel")); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(window)); gtk_widget_show_all (button); button = create_button(window,_("OK")); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show_all (button); g_object_set_data(G_OBJECT (button), "Window", window); diff -up GabeditSrc239/src/Symmetry/MoleculeSymmetryInterface.c.gtk GabeditSrc239/src/Symmetry/MoleculeSymmetryInterface.c --- GabeditSrc239/src/Symmetry/MoleculeSymmetryInterface.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Symmetry/MoleculeSymmetryInterface.c 2011-07-18 20:59:26.000000000 +0200 @@ -210,7 +210,7 @@ void createGeometrySymmetryWindow(gint n Bouton = create_button(Dialogue,"OK"); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dialogue)->action_area), Bouton, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Bouton, TRUE); gtk_widget_grab_default(Bouton); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(Dialogue)); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue)); @@ -322,7 +322,7 @@ GtkWidget* createGeometryAbelianGroupWin Bouton = create_button(Dialogue,"OK"); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dialogue)->action_area), Bouton, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Bouton, TRUE); gtk_widget_grab_default(Bouton); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(Dialogue)); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(Dialogue)); @@ -608,13 +608,13 @@ void createToleranceWindow(GtkWidget* wi button = create_button(dialogWindow,"Cancel"); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(dialogWindow)); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(dialogWindow)); button = create_button(dialogWindow,"OK"); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)setToleranceParametersFromTmp, GTK_OBJECT(dialogWindow)); if(myFunc) g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)myFunc, GTK_OBJECT(dialogWindow)); diff -up GabeditSrc239/src/Utils/AtomsProp.c.gtk GabeditSrc239/src/Utils/AtomsProp.c --- GabeditSrc239/src/Utils/AtomsProp.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Utils/AtomsProp.c 2011-07-18 20:59:26.000000000 +0200 @@ -1329,14 +1329,14 @@ static void dialog_set_atom_prop(GtkWidg gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)destroy_button_windows,GTK_OBJECT(Dialogue)); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Dialogue)); - GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Bouton, TRUE); Bouton = create_button(Dialogue,_("OK")); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(Dialogue)->action_area), Bouton,TRUE,TRUE,0); g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)set_atom_prop, sdata); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)destroy_button_windows,GTK_OBJECT(Dialogue)); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(Dialogue)); - GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Bouton, TRUE); gtk_widget_grab_default(Bouton); add_button_windows(_(" Set properties "),Dialogue); @@ -1468,7 +1468,7 @@ void create_table_prop() gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 2); g_signal_connect_swapped(G_OBJECT(button),"clicked", (GCallback)destroy_button_windows, GTK_OBJECT(WinTable)); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(WinTable)); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show(button); diff -up GabeditSrc239/src/Utils/ConvUtils.c.gtk GabeditSrc239/src/Utils/ConvUtils.c --- GabeditSrc239/src/Utils/ConvUtils.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Utils/ConvUtils.c 2011-07-18 20:59:26.000000000 +0200 @@ -945,7 +945,7 @@ void create_conversion_dlg() gtk_box_pack_end (GTK_BOX( GTK_DIALOG(Dlg)->action_area), Button, FALSE, TRUE, 5); g_signal_connect_swapped(G_OBJECT(Button), "clicked",(GCallback)destroy_dlg,GTK_OBJECT(Dlg)); - GTK_WIDGET_SET_FLAGS(Button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Button, TRUE); gtk_widget_grab_default(Button); gtk_widget_show_all(GTK_DIALOG(Dlg)->vbox); gtk_widget_show_all(GTK_DIALOG(Dlg)->action_area); diff -up GabeditSrc239/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc239/src/Utils/GabeditContoursPlot.c --- GabeditSrc239/src/Utils/GabeditContoursPlot.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Utils/GabeditContoursPlot.c 2011-07-18 20:59:26.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); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,GTK_OBJECT(window)); gtk_widget_show (button); button = gtk_button_new_from_stock(GTK_STOCK_OK); gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); gtk_widget_show (button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_contours,GTK_OBJECT(window)); @@ -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); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(dialogWindow)); button = gtk_button_new_from_stock (GTK_STOCK_APPLY); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)applyColorMapOptions, GTK_OBJECT(dialogWindow)); button = gtk_button_new_from_stock (GTK_STOCK_OK); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)applyColorMapOptions, GTK_OBJECT(dialogWindow)); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(dialogWindow)); @@ -7083,7 +7083,7 @@ static void gabedit_contoursplot_realize g_return_if_fail (widget != NULL); g_return_if_fail (GABEDIT_IS_ContoursPLOT (widget)); - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + gtk_widget_set_can_default (widget, GTK_REALIZED); contoursplot = GABEDIT_ContoursPLOT (widget); attributes.x = widget->allocation.x; @@ -7503,7 +7503,7 @@ static void gabedit_contoursplot_size_al widget->allocation = *allocation; contoursplot=GABEDIT_ContoursPLOT(widget); - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized(widget)) gdk_window_move_resize (widget->window, allocation->x, allocation->y, @@ -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; - if (GTK_WIDGET_REALIZED(widget) && widget->window) + if (gtk_widget_get_realized(widget) && widget->window) { contoursplot->old_area=gdk_pixmap_copy(widget->window); } @@ -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); - if (GTK_WIDGET_REALIZED(widget)) + if (gtk_widget_get_realized(widget)) { 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); @@ -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); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, diff -up GabeditSrc239/src/Utils/GabeditXYPlot.c.gtk GabeditSrc239/src/Utils/GabeditXYPlot.c --- GabeditSrc239/src/Utils/GabeditXYPlot.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Utils/GabeditXYPlot.c 2011-07-18 20:59:26.000000000 +0200 @@ -6851,7 +6851,7 @@ static void gabedit_xyplot_realize (GtkW g_return_if_fail (widget != NULL); g_return_if_fail (GABEDIT_IS_XYPLOT (widget)); - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + gtk_widget_set_can_default (widget, GTK_REALIZED); xyplot = GABEDIT_XYPLOT (widget); attributes.x = widget->allocation.x; @@ -7266,7 +7266,7 @@ static void gabedit_xyplot_size_allocate widget->allocation = *allocation; xyplot=GABEDIT_XYPLOT(widget); - if (GTK_WIDGET_REALIZED (widget)) + if (gtk_widget_get_realized(widget)) gdk_window_move_resize (widget->window, allocation->x, allocation->y, @@ -8040,7 +8040,7 @@ static void set_old_area(GtkWidget *widg if (xyplot->old_area!=NULL) g_object_unref(G_OBJECT(xyplot->old_area)); xyplot->old_area=NULL; - if (GTK_WIDGET_REALIZED(widget) && widget->window) + if (gtk_widget_get_realized(widget) && widget->window) { xyplot->old_area=gdk_pixmap_copy(widget->window); } @@ -9903,7 +9903,7 @@ static void xyplot_calculate_sizes (Gabe if (xyplot->cairo_widget!=NULL) cairo_destroy (xyplot->cairo_widget); if (xyplot->cairo_area!=NULL) cairo_destroy (xyplot->cairo_area); - if (GTK_WIDGET_REALIZED(widget)) + if (gtk_widget_get_realized(widget)) { xyplot->plotting_area=gdk_pixmap_new(widget->window, xyplot->plotting_rect.width, xyplot->plotting_rect.height, -1); xyplot->cairo_area = gdk_cairo_create (xyplot->plotting_area); @@ -10768,7 +10768,7 @@ void gabedit_xyplot_help() gtk_box_set_homogeneous (GTK_BOX( GTK_DIALOG(dialog)->action_area), FALSE); button = gtk_button_new_from_stock (GTK_STOCK_OK); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(dialog)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, diff -up GabeditSrc239/src/Utils/PovrayUtils.c.gtk GabeditSrc239/src/Utils/PovrayUtils.c --- GabeditSrc239/src/Utils/PovrayUtils.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Utils/PovrayUtils.c 2011-07-18 20:59:26.000000000 +0200 @@ -137,13 +137,13 @@ void createPovrayOptionsWindow(GtkWidget button = create_button(dialogWindow,"Cancel"); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(dialogWindow)); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(dialogWindow)); button = create_button(dialogWindow,"OK"); gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)applyPovrayOptions, GTK_OBJECT(dialogWindow)); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(dialogWindow)); diff -up GabeditSrc239/src/Utils/UtilsCairo.c.gtk GabeditSrc239/src/Utils/UtilsCairo.c --- GabeditSrc239/src/Utils/UtilsCairo.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Utils/UtilsCairo.c 2011-07-18 20:59:26.000000000 +0200 @@ -27,6 +27,7 @@ DEALINGS IN THE SOFTWARE. #include <cairo-pdf.h> #include <cairo-ps.h> #include <cairo-svg.h> +#include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> #include <glib.h> diff -up GabeditSrc239/src/Utils/Utils.c.gtk GabeditSrc239/src/Utils/Utils.c --- GabeditSrc239/src/Utils/Utils.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Utils/Utils.c 2011-07-18 20:59:26.000000000 +0200 @@ -25,6 +25,7 @@ DEALINGS IN THE SOFTWARE. #include <time.h> #include <GL/gl.h> #include <GL/glu.h> +#include <gdk/gdk.h> #include "../Common/Global.h" #include "../Utils/Constants.h" diff -up GabeditSrc239/src/Utils/UtilsInterface.c.gtk GabeditSrc239/src/Utils/UtilsInterface.c --- GabeditSrc239/src/Utils/UtilsInterface.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/Utils/UtilsInterface.c 2011-07-18 20:59:26.000000000 +0200 @@ -22,6 +22,8 @@ DEALINGS IN THE SOFTWARE. #include <stdlib.h> #include <ctype.h> #include <unistd.h> +#include <gdk/gdk.h> +#include <gtk/gtk.h> #include "../Common/Global.h" #include "../Utils/Constants.h" @@ -641,7 +643,7 @@ GtkWidget* Message(char *message,char *t Bouton = create_button(DialogueMessage,_("OK")); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(DialogueMessage)->action_area), Bouton, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Bouton, TRUE); gtk_widget_grab_default(Bouton); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)destroy_button_windows, @@ -689,7 +691,7 @@ GtkWidget* MessageTxt(gchar *message,gch button = create_button(dlgWin,_("OK")); gtk_box_pack_end (GTK_BOX( GTK_DIALOG(dlgWin)->action_area), button, FALSE, TRUE, 5); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(dlgWin)); g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(dlgWin)); @@ -781,12 +783,12 @@ void Cancel_YesNo(GtkWidget *widget, gpo Bouton = create_button(DialogueMessage,_("No")); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage)); - GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Bouton, TRUE); gtk_widget_grab_default(Bouton); Bouton = create_button(DialogueMessage,_("Yes")); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0); - GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Bouton, TRUE); g_signal_connect_swapped(G_OBJECT(Bouton),"clicked", (GCallback)func, GTK_OBJECT(widget)); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage)); @@ -2350,12 +2352,12 @@ GtkWidget *Continue_YesNo(void (*func)(G Bouton = create_button(DialogueMessage,_("No")); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area),Bouton,TRUE,TRUE,0); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage)); - GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Bouton, TRUE); gtk_widget_grab_default(Bouton); Bouton = create_button(DialogueMessage,_("Yes")); gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0); - GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(Bouton, TRUE); g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)func,data); g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage)); diff -up GabeditSrc239/src/VibrationalCorrections/GabeditGaussianInput.c.gtk GabeditSrc239/src/VibrationalCorrections/GabeditGaussianInput.c --- GabeditSrc239/src/VibrationalCorrections/GabeditGaussianInput.c.gtk 2011-07-12 23:11:04.000000000 +0200 +++ GabeditSrc239/src/VibrationalCorrections/GabeditGaussianInput.c 2011-07-18 20:59:26.000000000 +0200 @@ -259,7 +259,7 @@ static GtkWidget* createResultWindow(gch button = create_button(resultWindow,_("OK")); gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, FALSE, 1); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, TRUE); gtk_widget_grab_default(button); g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)destroy_children,G_OBJECT(resultWindow)); gtk_widget_show (button);