diff -up GabeditSrc245/src/Common/Exit.c.gtk GabeditSrc245/src/Common/Exit.c
--- GabeditSrc245/src/Common/Exit.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Common/Exit.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Common/Install.c.gtk GabeditSrc245/src/Common/Install.c
--- GabeditSrc245/src/Common/Install.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Common/Install.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Common/MenuToolBar.c.gtk GabeditSrc245/src/Common/MenuToolBar.c
--- GabeditSrc245/src/Common/MenuToolBar.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Common/MenuToolBar.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Common/Preferences.c.gtk GabeditSrc245/src/Common/Preferences.c
--- GabeditSrc245/src/Common/Preferences.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Common/Preferences.c 2012-12-18 22:29:13.000000000 +0100
@@ -2453,7 +2453,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));
@@ -2502,7 +2502,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));
@@ -2546,7 +2546,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));
@@ -2678,7 +2678,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));
@@ -2722,7 +2722,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));
@@ -2764,7 +2764,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));
@@ -2806,7 +2806,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));
@@ -2949,7 +2949,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));
@@ -3168,13 +3168,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);
@@ -3183,7 +3183,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));
@@ -3191,7 +3191,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);
@@ -3443,19 +3443,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));
@@ -3636,18 +3636,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 GabeditSrc245/src/Common/Printer.c.gtk GabeditSrc245/src/Common/Printer.c
--- GabeditSrc245/src/Common/Printer.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Common/Printer.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Common/Run.c.gtk GabeditSrc245/src/Common/Run.c
--- GabeditSrc245/src/Common/Run.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Common/Run.c 2012-12-18 22:29:13.000000000 +0100
@@ -100,9 +100,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;
@@ -418,7 +415,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);
@@ -5532,10 +5529,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]));
@@ -5572,7 +5565,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) ;
@@ -5597,10 +5589,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;
@@ -5623,7 +5611,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) ;
@@ -5866,14 +5853,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 GabeditSrc245/src/Common/SplashScreen.c.gtk GabeditSrc245/src/Common/SplashScreen.c
--- GabeditSrc245/src/Common/SplashScreen.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Common/SplashScreen.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Common/TextEdit.c.gtk GabeditSrc245/src/Common/TextEdit.c
--- GabeditSrc245/src/Common/TextEdit.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Common/TextEdit.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/AnimationGeomConv.c.gtk GabeditSrc245/src/Display/AnimationGeomConv.c
--- GabeditSrc245/src/Display/AnimationGeomConv.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/AnimationGeomConv.c 2012-12-18 22:29:13.000000000 +0100
@@ -5214,7 +5214,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));
@@ -5287,7 +5287,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));
@@ -5295,7 +5295,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 GabeditSrc245/src/Display/AnimationMD.c.gtk GabeditSrc245/src/Display/AnimationMD.c
--- GabeditSrc245/src/Display/AnimationMD.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/AnimationMD.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/CaptureOrbitals.c.gtk GabeditSrc245/src/Display/CaptureOrbitals.c
--- GabeditSrc245/src/Display/CaptureOrbitals.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/CaptureOrbitals.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/ColorMap.c.gtk GabeditSrc245/src/Display/ColorMap.c
--- GabeditSrc245/src/Display/ColorMap.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/ColorMap.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/Contours.c.gtk GabeditSrc245/src/Display/Contours.c
--- GabeditSrc245/src/Display/Contours.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/Contours.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/Dipole.c.gtk GabeditSrc245/src/Display/Dipole.c
--- GabeditSrc245/src/Display/Dipole.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/Dipole.c 2012-12-18 22:42:48.000000000 +0100
@@ -143,7 +143,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));
@@ -367,7 +367,7 @@ static GtkWidget* showResultDlg(gchar *m
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)gtk_widget_destroy, GTK_OBJECT(dlgWin));
diff -up GabeditSrc245/src/Display/GLArea.c.gtk GabeditSrc245/src/Display/GLArea.c
--- GabeditSrc245/src/Display/GLArea.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/GLArea.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/GridAdfOrbitals.c.gtk GabeditSrc245/src/Display/GridAdfOrbitals.c
--- GabeditSrc245/src/Display/GridAdfOrbitals.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/GridAdfOrbitals.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/GridCP.c.gtk GabeditSrc245/src/Display/GridCP.c
--- GabeditSrc245/src/Display/GridCP.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/GridCP.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/GridCube.c.gtk GabeditSrc245/src/Display/GridCube.c
--- GabeditSrc245/src/Display/GridCube.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/GridCube.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/GridMolcas.c.gtk GabeditSrc245/src/Display/GridMolcas.c
--- GabeditSrc245/src/Display/GridMolcas.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/GridMolcas.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/GridPlans.c.gtk GabeditSrc245/src/Display/GridPlans.c
--- GabeditSrc245/src/Display/GridPlans.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/GridPlans.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/GridQChem.c.gtk GabeditSrc245/src/Display/GridQChem.c
--- GabeditSrc245/src/Display/GridQChem.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/GridQChem.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/IntegralOrbitals.c.gtk GabeditSrc245/src/Display/IntegralOrbitals.c
--- GabeditSrc245/src/Display/IntegralOrbitals.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/IntegralOrbitals.c 2012-12-18 22:29:13.000000000 +0100
@@ -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));
@@ -2675,13 +2675,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 GabeditSrc245/src/Display/LabelsGL.c.gtk GabeditSrc245/src/Display/LabelsGL.c
--- GabeditSrc245/src/Display/LabelsGL.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/LabelsGL.c 2012-12-18 22:29:13.000000000 +0100
@@ -733,19 +733,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 GabeditSrc245/src/Display/MenuToolBarGL.c.gtk GabeditSrc245/src/Display/MenuToolBarGL.c
--- GabeditSrc245/src/Display/MenuToolBarGL.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/MenuToolBarGL.c 2012-12-18 22:29:13.000000000 +0100
@@ -2098,7 +2098,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 GabeditSrc245/src/Display/NCI.c.gtk GabeditSrc245/src/Display/NCI.c
--- GabeditSrc245/src/Display/NCI.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/NCI.c 2012-12-18 22:44:54.000000000 +0100
@@ -465,7 +465,7 @@ void nci2D_analysis_dlg(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));
@@ -473,7 +473,7 @@ void nci2D_analysis_dlg(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)apply_nci2D_analysis,G_OBJECT(Win));
@@ -593,7 +593,7 @@ void nci_surface_dlg(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));
@@ -601,7 +601,7 @@ void nci_surface_dlg(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)apply_nci_surface,G_OBJECT(Win));
diff -up GabeditSrc245/src/Display/Orbitals.c.gtk GabeditSrc245/src/Display/Orbitals.c
--- GabeditSrc245/src/Display/Orbitals.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/Orbitals.c 2012-12-18 22:29:13.000000000 +0100
@@ -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));
@@ -1055,7 +1055,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));
@@ -1063,7 +1063,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));
@@ -1164,7 +1164,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);
@@ -1191,7 +1191,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 GabeditSrc245/src/Display/OrbitalsMolpro.c.gtk GabeditSrc245/src/Display/OrbitalsMolpro.c
--- GabeditSrc245/src/Display/OrbitalsMolpro.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/OrbitalsMolpro.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/PlanesMapped.c.gtk GabeditSrc245/src/Display/PlanesMapped.c
--- GabeditSrc245/src/Display/PlanesMapped.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/PlanesMapped.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/PovrayGL.c.gtk GabeditSrc245/src/Display/PovrayGL.c
--- GabeditSrc245/src/Display/PovrayGL.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/PovrayGL.c 2012-12-18 22:29:13.000000000 +0100
@@ -1882,19 +1882,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 GabeditSrc245/src/Display/PreferencesOrb.c.gtk GabeditSrc245/src/Display/PreferencesOrb.c
--- GabeditSrc245/src/Display/PreferencesOrb.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/PreferencesOrb.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Display/UtilsOrb.c.gtk GabeditSrc245/src/Display/UtilsOrb.c
--- GabeditSrc245/src/Display/UtilsOrb.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/UtilsOrb.c 2012-12-18 22:29:13.000000000 +0100
@@ -1164,7 +1164,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));
@@ -1172,7 +1172,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));
@@ -1379,7 +1379,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));
@@ -1387,7 +1387,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));
@@ -2056,7 +2056,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));
@@ -2064,7 +2064,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));
@@ -2182,19 +2182,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));
@@ -2226,7 +2226,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);
@@ -2257,7 +2257,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);
@@ -2290,7 +2290,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 GabeditSrc245/src/Display/Vibration.c.gtk GabeditSrc245/src/Display/Vibration.c
--- GabeditSrc245/src/Display/Vibration.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Display/Vibration.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Files/FileChooser.c.gtk GabeditSrc245/src/Files/FileChooser.c
--- GabeditSrc245/src/Files/FileChooser.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Files/FileChooser.c 2012-12-18 22:29:13.000000000 +0100
@@ -514,14 +514,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 */
@@ -529,7 +529,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 GabeditSrc245/src/Files/ListeFiles.c.gtk GabeditSrc245/src/Files/ListeFiles.c
--- GabeditSrc245/src/Files/ListeFiles.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Files/ListeFiles.c 2012-12-18 22:29:13.000000000 +0100
@@ -543,7 +543,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));
@@ -893,14 +893,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);
@@ -2513,14 +2513,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 GabeditSrc245/src/FireFly/FireFly.c.gtk GabeditSrc245/src/FireFly/FireFly.c
--- GabeditSrc245/src/FireFly/FireFly.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/FireFly/FireFly.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Gamess/Gamess.c.gtk GabeditSrc245/src/Gamess/Gamess.c
--- GabeditSrc245/src/Gamess/Gamess.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Gamess/Gamess.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Gaussian/Gaussian.c.gtk GabeditSrc245/src/Gaussian/Gaussian.c
--- GabeditSrc245/src/Gaussian/Gaussian.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Gaussian/Gaussian.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Gaussian/GInterfaceBasis.c.gtk GabeditSrc245/src/Gaussian/GInterfaceBasis.c
--- GabeditSrc245/src/Gaussian/GInterfaceBasis.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Gaussian/GInterfaceBasis.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/BuildLinear.c.gtk GabeditSrc245/src/Geometry/BuildLinear.c
--- GabeditSrc245/src/Geometry/BuildLinear.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/BuildLinear.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/BuildNanoTube.c.gtk GabeditSrc245/src/Geometry/BuildNanoTube.c
--- GabeditSrc245/src/Geometry/BuildNanoTube.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/BuildNanoTube.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/BuildPolyNucleicAcid.c.gtk GabeditSrc245/src/Geometry/BuildPolyNucleicAcid.c
--- GabeditSrc245/src/Geometry/BuildPolyNucleicAcid.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/BuildPolyNucleicAcid.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/BuildPolyPeptide.c.gtk GabeditSrc245/src/Geometry/BuildPolyPeptide.c
--- GabeditSrc245/src/Geometry/BuildPolyPeptide.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/BuildPolyPeptide.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/BuildPolySaccharide.c.gtk GabeditSrc245/src/Geometry/BuildPolySaccharide.c
--- GabeditSrc245/src/Geometry/BuildPolySaccharide.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/BuildPolySaccharide.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/BuildRing.c.gtk GabeditSrc245/src/Geometry/BuildRing.c
--- GabeditSrc245/src/Geometry/BuildRing.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/BuildRing.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/BuildRoZPhi.c.gtk GabeditSrc245/src/Geometry/BuildRoZPhi.c
--- GabeditSrc245/src/Geometry/BuildRoZPhi.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/BuildRoZPhi.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/DrawGeomCairo.c.gtk GabeditSrc245/src/Geometry/DrawGeomCairo.c
--- GabeditSrc245/src/Geometry/DrawGeomCairo.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/DrawGeomCairo.c 2012-12-18 22:29:13.000000000 +0100
@@ -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"
@@ -2850,13 +2852,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);
@@ -2949,13 +2951,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);
@@ -3073,13 +3075,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);
@@ -3209,13 +3211,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);
@@ -3289,13 +3291,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);
@@ -6160,7 +6162,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,
@@ -6209,7 +6211,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 GabeditSrc245/src/Geometry/EnergiesCurves.c.gtk GabeditSrc245/src/Geometry/EnergiesCurves.c
--- GabeditSrc245/src/Geometry/EnergiesCurves.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/EnergiesCurves.c 2012-12-18 22:29:13.000000000 +0100
@@ -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"
@@ -158,7 +159,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,
@@ -183,7 +184,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,
@@ -688,20 +689,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 GabeditSrc245/src/Geometry/GeomXYZ.c.gtk GabeditSrc245/src/Geometry/GeomXYZ.c
--- GabeditSrc245/src/Geometry/GeomXYZ.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/GeomXYZ.c 2012-12-18 22:29:13.000000000 +0100
@@ -2228,14 +2228,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);
@@ -2284,14 +2284,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);
@@ -2881,13 +2881,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);
@@ -3046,13 +3046,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);
@@ -3103,14 +3103,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);
@@ -12909,7 +12909,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));
@@ -12919,7 +12919,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);
@@ -13187,14 +13187,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);
@@ -13254,13 +13254,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);
@@ -13360,13 +13360,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 GabeditSrc245/src/Geometry/GeomZmatrix.c.gtk GabeditSrc245/src/Geometry/GeomZmatrix.c
--- GabeditSrc245/src/Geometry/GeomZmatrix.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/GeomZmatrix.c 2012-12-18 22:29:13.000000000 +0100
@@ -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);
@@ -7226,14 +7226,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);
@@ -7291,13 +7291,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);
@@ -7398,13 +7398,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 GabeditSrc245/src/Geometry/ImagesGeom.c.gtk GabeditSrc245/src/Geometry/ImagesGeom.c
--- GabeditSrc245/src/Geometry/ImagesGeom.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/ImagesGeom.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/MenuToolBarGeom.c.gtk GabeditSrc245/src/Geometry/MenuToolBarGeom.c
--- GabeditSrc245/src/Geometry/MenuToolBarGeom.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/MenuToolBarGeom.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/OpenBabel.c.gtk GabeditSrc245/src/Geometry/OpenBabel.c
--- GabeditSrc245/src/Geometry/OpenBabel.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/OpenBabel.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/PersonalFragments.c.gtk GabeditSrc245/src/Geometry/PersonalFragments.c
--- GabeditSrc245/src/Geometry/PersonalFragments.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/PersonalFragments.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/Povray.c.gtk GabeditSrc245/src/Geometry/Povray.c
--- GabeditSrc245/src/Geometry/Povray.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/Povray.c 2012-12-18 22:29:13.000000000 +0100
@@ -1370,19 +1370,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 GabeditSrc245/src/Geometry/PreviewGeom.c.gtk GabeditSrc245/src/Geometry/PreviewGeom.c
--- GabeditSrc245/src/Geometry/PreviewGeom.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/PreviewGeom.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/ResultsAnalise.c.gtk GabeditSrc245/src/Geometry/ResultsAnalise.c
--- GabeditSrc245/src/Geometry/ResultsAnalise.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/ResultsAnalise.c 2012-12-18 22:29:13.000000000 +0100
@@ -2931,7 +2931,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);
@@ -2939,25 +2939,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"));
@@ -2994,7 +2994,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",
@@ -3004,7 +3004,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);
@@ -3012,7 +3012,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);
@@ -3020,7 +3020,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 GabeditSrc245/src/Geometry/SelectionDlg.c.gtk GabeditSrc245/src/Geometry/SelectionDlg.c
--- GabeditSrc245/src/Geometry/SelectionDlg.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/SelectionDlg.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Geometry/Symmetry.c.gtk GabeditSrc245/src/Geometry/Symmetry.c
--- GabeditSrc245/src/Geometry/Symmetry.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Geometry/Symmetry.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Molcas/MolcasBasis.c.gtk GabeditSrc245/src/Molcas/MolcasBasis.c
--- GabeditSrc245/src/Molcas/MolcasBasis.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Molcas/MolcasBasis.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Molcas/MolcasBasisLibrary.c.gtk GabeditSrc245/src/Molcas/MolcasBasisLibrary.c
--- GabeditSrc245/src/Molcas/MolcasBasisLibrary.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Molcas/MolcasBasisLibrary.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Molcas/Molcas.c.gtk GabeditSrc245/src/Molcas/Molcas.c
--- GabeditSrc245/src/Molcas/Molcas.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Molcas/Molcas.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Molcas/MolcasGateWay.c.gtk GabeditSrc245/src/Molcas/MolcasGateWay.c
--- GabeditSrc245/src/Molcas/MolcasGateWay.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Molcas/MolcasGateWay.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/MolecularMechanics/MolecularMechanicsDlg.c.gtk GabeditSrc245/src/MolecularMechanics/MolecularMechanicsDlg.c
--- GabeditSrc245/src/MolecularMechanics/MolecularMechanicsDlg.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/MolecularMechanics/MolecularMechanicsDlg.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/MolecularMechanics/SetMMParameters.c.gtk GabeditSrc245/src/MolecularMechanics/SetMMParameters.c
--- GabeditSrc245/src/MolecularMechanics/SetMMParameters.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/MolecularMechanics/SetMMParameters.c 2012-12-18 22:29:13.000000000 +0100
@@ -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"
@@ -1022,14 +1023,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);
@@ -1152,14 +1153,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);
@@ -1350,7 +1351,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);
@@ -1358,7 +1359,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);
@@ -1567,14 +1568,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);
@@ -1834,14 +1835,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);
@@ -2023,14 +2024,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);
@@ -2192,13 +2193,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);
@@ -2378,13 +2379,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 GabeditSrc245/src/MolecularMechanics/SetPDBTemplate.c.gtk GabeditSrc245/src/MolecularMechanics/SetPDBTemplate.c
--- GabeditSrc245/src/MolecularMechanics/SetPDBTemplate.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/MolecularMechanics/SetPDBTemplate.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Molpro/MInterfaceBasis.c.gtk GabeditSrc245/src/Molpro/MInterfaceBasis.c
--- GabeditSrc245/src/Molpro/MInterfaceBasis.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Molpro/MInterfaceBasis.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Molpro/MolproBasisLibrary.c.gtk GabeditSrc245/src/Molpro/MolproBasisLibrary.c
--- GabeditSrc245/src/Molpro/MolproBasisLibrary.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Molpro/MolproBasisLibrary.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Molpro/Molpro.c.gtk GabeditSrc245/src/Molpro/Molpro.c
--- GabeditSrc245/src/Molpro/Molpro.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Molpro/Molpro.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Mopac/Mopac.c.gtk GabeditSrc245/src/Mopac/Mopac.c
--- GabeditSrc245/src/Mopac/Mopac.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Mopac/Mopac.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/MPQC/MPQCBasisLibrary.c.gtk GabeditSrc245/src/MPQC/MPQCBasisLibrary.c
--- GabeditSrc245/src/MPQC/MPQCBasisLibrary.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/MPQC/MPQCBasisLibrary.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/MPQC/MPQC.c.gtk GabeditSrc245/src/MPQC/MPQC.c
--- GabeditSrc245/src/MPQC/MPQC.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/MPQC/MPQC.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/MPQC/MPQCFunctionals.c.gtk GabeditSrc245/src/MPQC/MPQCFunctionals.c
--- GabeditSrc245/src/MPQC/MPQCFunctionals.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/MPQC/MPQCFunctionals.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/NetWork/Batch.c.gtk GabeditSrc245/src/NetWork/Batch.c
--- GabeditSrc245/src/NetWork/Batch.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/NetWork/Batch.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/NetWork/Process.c.gtk GabeditSrc245/src/NetWork/Process.c
--- GabeditSrc245/src/NetWork/Process.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/NetWork/Process.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/NWChem/NWChem.c.gtk GabeditSrc245/src/NWChem/NWChem.c
--- GabeditSrc245/src/NWChem/NWChem.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/NWChem/NWChem.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Orca/OrcaBasis.c.gtk GabeditSrc245/src/Orca/OrcaBasis.c
--- GabeditSrc245/src/Orca/OrcaBasis.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Orca/OrcaBasis.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Orca/Orca.c.gtk GabeditSrc245/src/Orca/Orca.c
--- GabeditSrc245/src/Orca/Orca.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Orca/Orca.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Psicode/Psicode.c.gtk GabeditSrc245/src/Psicode/Psicode.c
--- GabeditSrc245/src/Psicode/Psicode.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Psicode/Psicode.c 2012-12-18 22:48:02.000000000 +0100
@@ -175,7 +175,7 @@ static void psicodeInputFileWindow(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"));
@@ -195,7 +195,7 @@ static void psicodeInputFileWindow(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 GabeditSrc245/src/QChem/QChem.c.gtk GabeditSrc245/src/QChem/QChem.c
--- GabeditSrc245/src/QChem/QChem.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/QChem/QChem.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/SemiEmpirical/SemiEmpiricalDlg.c.gtk GabeditSrc245/src/SemiEmpirical/SemiEmpiricalDlg.c
--- GabeditSrc245/src/SemiEmpirical/SemiEmpiricalDlg.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/SemiEmpirical/SemiEmpiricalDlg.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Spectrum/ECDSpectrum.c.gtk GabeditSrc245/src/Spectrum/ECDSpectrum.c
--- GabeditSrc245/src/Spectrum/ECDSpectrum.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Spectrum/ECDSpectrum.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Spectrum/UVSpectrum.c.gtk GabeditSrc245/src/Spectrum/UVSpectrum.c
--- GabeditSrc245/src/Spectrum/UVSpectrum.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Spectrum/UVSpectrum.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Symmetry/MoleculeSymmetryInterface.c.gtk GabeditSrc245/src/Symmetry/MoleculeSymmetryInterface.c
--- GabeditSrc245/src/Symmetry/MoleculeSymmetryInterface.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Symmetry/MoleculeSymmetryInterface.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Utils/AtomsProp.c.gtk GabeditSrc245/src/Utils/AtomsProp.c
--- GabeditSrc245/src/Utils/AtomsProp.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Utils/AtomsProp.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Utils/ConvUtils.c.gtk GabeditSrc245/src/Utils/ConvUtils.c
--- GabeditSrc245/src/Utils/ConvUtils.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Utils/ConvUtils.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc245/src/Utils/GabeditContoursPlot.c
--- GabeditSrc245/src/Utils/GabeditContoursPlot.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Utils/GabeditContoursPlot.c 2012-12-18 22:29:13.000000000 +0100
@@ -1763,14 +1763,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));
@@ -6213,17 +6213,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));
@@ -7089,7 +7089,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;
@@ -7509,7 +7509,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,
@@ -8538,7 +8538,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);
}
@@ -10538,7 +10538,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);
@@ -11155,7 +11155,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 GabeditSrc245/src/Utils/GabeditXYPlot.c.gtk GabeditSrc245/src/Utils/GabeditXYPlot.c
--- GabeditSrc245/src/Utils/GabeditXYPlot.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Utils/GabeditXYPlot.c 2012-12-18 22:29:13.000000000 +0100
@@ -7101,7 +7101,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;
@@ -7516,7 +7516,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,
@@ -8290,7 +8290,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);
}
@@ -10154,7 +10154,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);
@@ -11019,7 +11019,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 GabeditSrc245/src/Utils/PovrayUtils.c.gtk GabeditSrc245/src/Utils/PovrayUtils.c
--- GabeditSrc245/src/Utils/PovrayUtils.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Utils/PovrayUtils.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Utils/UtilsCairo.c.gtk GabeditSrc245/src/Utils/UtilsCairo.c
--- GabeditSrc245/src/Utils/UtilsCairo.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Utils/UtilsCairo.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Utils/Utils.c.gtk GabeditSrc245/src/Utils/Utils.c
--- GabeditSrc245/src/Utils/Utils.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Utils/Utils.c 2012-12-18 22:29:13.000000000 +0100
@@ -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 GabeditSrc245/src/Utils/UtilsInterface.c.gtk GabeditSrc245/src/Utils/UtilsInterface.c
--- GabeditSrc245/src/Utils/UtilsInterface.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/Utils/UtilsInterface.c 2012-12-18 22:29:13.000000000 +0100
@@ -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"
@@ -642,7 +644,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,
@@ -690,7 +692,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));
@@ -782,12 +784,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));
@@ -2424,12 +2426,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 GabeditSrc245/src/VibrationalCorrections/GabeditGaussianInput.c.gtk GabeditSrc245/src/VibrationalCorrections/GabeditGaussianInput.c
--- GabeditSrc245/src/VibrationalCorrections/GabeditGaussianInput.c.gtk 2012-09-14 10:43:31.000000000 +0200
+++ GabeditSrc245/src/VibrationalCorrections/GabeditGaussianInput.c 2012-12-18 22:29:13.000000000 +0100
@@ -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);