[gabedit/f14/master] More GTK2 deprecated usage fixes.
Dominik Mierzejewski
rathann at fedoraproject.org
Thu Aug 26 21:52:01 UTC 2010
commit 392af68036b17ea3745eae1820edcbc84fc2d799
Author: Dominik Mierzejewski <dominik at greysector.net>
Date: Thu Aug 26 23:51:35 2010 +0200
More GTK2 deprecated usage fixes.
gabedit-gtk.patch | 346 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 337 insertions(+), 9 deletions(-)
---
diff --git a/gabedit-gtk.patch b/gabedit-gtk.patch
index 28032fc..1b0be84 100644
--- a/gabedit-gtk.patch
+++ b/gabedit-gtk.patch
@@ -1,6 +1,161 @@
+diff -up GabeditSrc230/src/Common/Install.c.gtk GabeditSrc230/src/Common/Install.c
+--- GabeditSrc230/src/Common/Install.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Common/Install.c 2010-08-26 23:48:10.000000000 +0200
+@@ -463,13 +463,13 @@ void create_buttons_dialog(GtkWidget* di
+ gtk_box_pack_end (GTK_BOX(action_area), button, FALSE, TRUE, 0);
+ g_signal_connect_swapped(GTK_OBJECT(button), "clicked", G_CALLBACK(user_install_cancel_callback),GTK_OBJECT(dialog));
+
+- 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 GabeditSrc230/src/Common/Preferences.c.gtk GabeditSrc230/src/Common/Preferences.c
+--- GabeditSrc230/src/Common/Preferences.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Common/Preferences.c 2010-08-26 23:49:07.000000000 +0200
+@@ -2149,7 +2149,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));
+@@ -2198,7 +2198,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));
+@@ -2242,7 +2242,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));
+@@ -2286,7 +2286,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));
+@@ -2330,7 +2330,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));
+@@ -2372,7 +2372,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));
+@@ -2414,7 +2414,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));
+@@ -2557,7 +2557,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));
+@@ -2774,13 +2774,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);
+@@ -2789,7 +2789,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));
+@@ -2797,7 +2797,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);
+diff -up GabeditSrc230/src/Common/Printer.c.gtk GabeditSrc230/src/Common/Printer.c
+--- GabeditSrc230/src/Common/Printer.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Common/Printer.c 2010-08-26 23:49:30.000000000 +0200
+@@ -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 GabeditSrc230/src/Common/SplashScreen.c.gtk GabeditSrc230/src/Common/SplashScreen.c
--- GabeditSrc230/src/Common/SplashScreen.c.gtk 2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Common/SplashScreen.c 2010-08-26 22:15:26.000000000 +0200
++++ GabeditSrc230/src/Common/SplashScreen.c 2010-08-26 22:17:15.000000000 +0200
@@ -352,7 +352,7 @@ static gint expose_event(GtkWidget *wid
pixmap = (GdkPixmap *)g_object_get_data(G_OBJECT(widget), "Pixmap");
if(pixmap)
@@ -10,9 +165,57 @@ diff -up GabeditSrc230/src/Common/SplashScreen.c.gtk GabeditSrc230/src/Common/Sp
pixmap,
event->area.x, event->area.y,
event->area.x, event->area.y,
+diff -up GabeditSrc230/src/Files/FileChooser.c.gtk GabeditSrc230/src/Files/FileChooser.c
+--- GabeditSrc230/src/Files/FileChooser.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Files/FileChooser.c 2010-08-26 23:46:22.000000000 +0200
+@@ -487,14 +487,14 @@ void Save_YesNo()
+ Bouton = create_button(DialogueMessage,_("Cancel"));
+ gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0);
+ g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage));
+- GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(Bouton, TRUE);
+ gtk_widget_grab_default(Bouton);
+
+ /* the No button */
+ Bouton = create_button(DialogueMessage,_("No"));
+ gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0);
+ g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)ExitDlg,NULL);
+- GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(Bouton, TRUE);
+ g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage));
+
+ /* the Yes button */
+@@ -502,7 +502,7 @@ void Save_YesNo()
+ gtk_box_pack_start( GTK_BOX(GTK_DIALOG(DialogueMessage)->action_area), Bouton,TRUE,TRUE,0);
+ g_signal_connect(G_OBJECT(Bouton), "clicked", (GCallback)choose_file_to_save_end,NULL);
+ g_signal_connect_swapped(G_OBJECT(Bouton), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(DialogueMessage));
+- GTK_WIDGET_SET_FLAGS(Bouton, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(Bouton, TRUE);
+
+
+
+diff -up GabeditSrc230/src/Gaussian/GInterfaceBasis.c.gtk GabeditSrc230/src/Gaussian/GInterfaceBasis.c
+--- GabeditSrc230/src/Gaussian/GInterfaceBasis.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Gaussian/GInterfaceBasis.c 2010-08-26 23:38:44.000000000 +0200
+@@ -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);
diff -up GabeditSrc230/src/Geometry/DrawGeom.c.gtk GabeditSrc230/src/Geometry/DrawGeom.c
--- GabeditSrc230/src/Geometry/DrawGeom.c.gtk 2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Geometry/DrawGeom.c 2010-08-26 22:16:54.000000000 +0200
++++ GabeditSrc230/src/Geometry/DrawGeom.c 2010-08-26 22:17:15.000000000 +0200
@@ -6841,7 +6841,7 @@ gint motion_notify(GtkWidget *widget, Gd
static void redraw()
{
@@ -33,7 +236,7 @@ diff -up GabeditSrc230/src/Geometry/DrawGeom.c.gtk GabeditSrc230/src/Geometry/Dr
event->area.x, event->area.y,
diff -up GabeditSrc230/src/Geometry/EnergiesCurves.c.gtk GabeditSrc230/src/Geometry/EnergiesCurves.c
--- GabeditSrc230/src/Geometry/EnergiesCurves.c.gtk 2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Geometry/EnergiesCurves.c 2010-08-26 22:15:26.000000000 +0200
++++ GabeditSrc230/src/Geometry/EnergiesCurves.c 2010-08-26 22:17:15.000000000 +0200
@@ -156,7 +156,7 @@ static gint expose_event (GtkWidget *wid
{
GdkPixmap *pixmap = (GdkPixmap*)(g_object_get_data(G_OBJECT(widget),"Pixmap"));
@@ -54,7 +257,7 @@ diff -up GabeditSrc230/src/Geometry/EnergiesCurves.c.gtk GabeditSrc230/src/Geome
0,0,
diff -up GabeditSrc230/src/Geometry/PreviewGeom.c.gtk GabeditSrc230/src/Geometry/PreviewGeom.c
--- GabeditSrc230/src/Geometry/PreviewGeom.c.gtk 2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Geometry/PreviewGeom.c 2010-08-26 22:15:26.000000000 +0200
++++ GabeditSrc230/src/Geometry/PreviewGeom.c 2010-08-26 22:17:15.000000000 +0200
@@ -729,7 +729,7 @@ static void redraw(GtkWidget *drawingAre
PrevData* prevData = (PrevData*)g_object_get_data(G_OBJECT (drawingArea), "PrevData");
if(!prevData)return;
@@ -75,7 +278,7 @@ diff -up GabeditSrc230/src/Geometry/PreviewGeom.c.gtk GabeditSrc230/src/Geometry
event->area.x, event->area.y,
diff -up GabeditSrc230/src/OpenGL/ColorMap.c.gtk GabeditSrc230/src/OpenGL/ColorMap.c
--- GabeditSrc230/src/OpenGL/ColorMap.c.gtk 2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/OpenGL/ColorMap.c 2010-08-26 22:15:26.000000000 +0200
++++ GabeditSrc230/src/OpenGL/ColorMap.c 2010-08-26 22:17:15.000000000 +0200
@@ -643,7 +643,7 @@ static gint expose_event(GtkWidget *wid
pixmap = (GdkPixmap *)g_object_get_data(G_OBJECT(widget), "Pixmap");
if(pixmap)
@@ -87,7 +290,7 @@ diff -up GabeditSrc230/src/OpenGL/ColorMap.c.gtk GabeditSrc230/src/OpenGL/ColorM
event->area.x, event->area.y,
diff -up GabeditSrc230/src/OpenGL/GLArea.c.gtk GabeditSrc230/src/OpenGL/GLArea.c
--- GabeditSrc230/src/OpenGL/GLArea.c.gtk 2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/OpenGL/GLArea.c 2010-08-26 22:15:26.000000000 +0200
++++ GabeditSrc230/src/OpenGL/GLArea.c 2010-08-26 22:17:15.000000000 +0200
@@ -781,7 +781,7 @@ gint init(GtkWidget *widget)
{
/* OpenGL functions can be called only if make_current returns true */
@@ -133,9 +336,112 @@ diff -up GabeditSrc230/src/OpenGL/GLArea.c.gtk GabeditSrc230/src/OpenGL/GLArea.c
/* OpenGL functions can be called only if make_current returns true */
if (gtk_gl_area_make_current(GTK_GL_AREA(widget)))
+diff -up GabeditSrc230/src/OpenGL/TriangleDraw.c.gtk GabeditSrc230/src/OpenGL/TriangleDraw.c
+--- GabeditSrc230/src/OpenGL/TriangleDraw.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/TriangleDraw.c 2010-08-26 23:50:01.000000000 +0200
+@@ -474,19 +474,19 @@ void set_opacity_dlg()
+
+ button = create_button(Win,_("OK"));
+ gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_widget_grab_default(button);
+ gtk_widget_show (button);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_set_opacity_close,G_OBJECT(Win));
+
+ button = create_button(Win,_("Apply"));
+ gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_widget_show (button);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_set_opacity,G_OBJECT(Win));
+
+ button = create_button(Win,_("Cancel"));
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win));
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
diff -up GabeditSrc230/src/OpenGL/UtilsOrb.c.gtk GabeditSrc230/src/OpenGL/UtilsOrb.c
--- GabeditSrc230/src/OpenGL/UtilsOrb.c.gtk 2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/OpenGL/UtilsOrb.c 2010-08-26 22:15:26.000000000 +0200
++++ GabeditSrc230/src/OpenGL/UtilsOrb.c 2010-08-26 23:50:26.000000000 +0200
+@@ -1117,7 +1117,7 @@ void create_grid(gchar* title)
+ gtk_widget_realize(Win);
+
+ button = create_button(Win,_("Cancel"));
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win));
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
+@@ -1125,7 +1125,7 @@ void create_grid(gchar* title)
+
+ button = create_button(Win,_("OK"));
+ gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_widget_grab_default(button);
+ gtk_widget_show (button);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)applygrid,G_OBJECT(Win));
+@@ -1332,7 +1332,7 @@ void create_grid_ELF_Dens_analyze(gboole
+ gtk_widget_realize(Win);
+
+ button = create_button(Win,_("Cancel"));
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win));
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
+@@ -1340,7 +1340,7 @@ void create_grid_ELF_Dens_analyze(gboole
+
+ button = create_button(Win,_("OK"));
+ gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_widget_grab_default(button);
+ gtk_widget_show (button);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)applyelfdens,G_OBJECT(Win));
+@@ -2150,7 +2150,7 @@ void create_grid_sas(gchar* title)
+ gtk_widget_realize(Win);
+
+ button = create_button(Win,_("Cancel"));
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win));
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
+@@ -2158,7 +2158,7 @@ void create_grid_sas(gchar* title)
+
+ button = create_button(Win,_("OK"));
+ gtk_box_pack_start (GTK_BOX( hbox), button, TRUE, TRUE, 3);
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_widget_grab_default(button);
+ gtk_widget_show (button);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)applygridsas,G_OBJECT(Win));
+@@ -2276,19 +2276,19 @@ void set_scale_ball_stick_dlg()
+
+ button = create_button(Win,_("OK"));
+ gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_widget_grab_default(button);
+ gtk_widget_show (button);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_set_scale_ball_stick_close,G_OBJECT(Win));
+
+ button = create_button(Win,_("Apply"));
+ gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_widget_show (button);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)apply_set_scale_ball_stick,G_OBJECT(Win));
+
+ button = create_button(Win,_("Cancel"));
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_box_pack_end (GTK_BOX( hbox), button, FALSE, TRUE, 3);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)delete_child, G_OBJECT(Win));
+ g_signal_connect_swapped(G_OBJECT(button), "clicked",(GCallback)gtk_widget_destroy,G_OBJECT(Win));
@@ -2320,7 +2320,7 @@ static void resetGridColorMap()
g_object_set_data(G_OBJECT(entryRight),"ColorMap", colorMap);
g_object_set_data(G_OBJECT(darea),"ColorMap", colorMap);
@@ -163,9 +469,31 @@ diff -up GabeditSrc230/src/OpenGL/UtilsOrb.c.gtk GabeditSrc230/src/OpenGL/UtilsO
{
gtk_widget_hide(handleBoxColorMapContours);
gtk_widget_show(handleBoxColorMapContours);
+@@ -2574,18 +2574,18 @@ void createColorMapOptionsWindow(GtkWidg
+
+ button = create_button(dialogWindow,_("Close"));
+ gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5);
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(dialogWindow));
+ g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)gtk_widget_destroy, GTK_OBJECT(dialogWindow));
+
+ button = create_button(dialogWindow,_("Apply"));
+ gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5);
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)applyColorMapOptions, GTK_OBJECT(dialogWindow));
+
+ button = create_button(dialogWindow,_("OK"));
+ gtk_box_pack_start (GTK_BOX( GTK_DIALOG(dialogWindow)->action_area), button, FALSE, TRUE, 5);
+- GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default(button, TRUE);
+ gtk_widget_grab_default(button);
+ g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)applyColorMapOptions, GTK_OBJECT(dialogWindow));
+ g_signal_connect_swapped(G_OBJECT(button), "clicked", (GCallback)destroy_button_windows, GTK_OBJECT(dialogWindow));
diff -up GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc230/src/Utils/GabeditContoursPlot.c
--- GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk 2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Utils/GabeditContoursPlot.c 2010-08-26 22:15:26.000000000 +0200
++++ GabeditSrc230/src/Utils/GabeditContoursPlot.c 2010-08-26 22:17:15.000000000 +0200
@@ -7501,7 +7501,7 @@ static void gabedit_contoursplot_size_al
widget->allocation = *allocation;
contoursplot=GABEDIT_ContoursPLOT(widget);
@@ -195,7 +523,7 @@ diff -up GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc230/src/Uti
contoursplot->cairo_area = gdk_cairo_create (contoursplot->plotting_area);
diff -up GabeditSrc230/src/Utils/GabeditXYPlot.c.gtk GabeditSrc230/src/Utils/GabeditXYPlot.c
--- GabeditSrc230/src/Utils/GabeditXYPlot.c.gtk 2010-07-12 09:11:42.000000000 +0200
-+++ GabeditSrc230/src/Utils/GabeditXYPlot.c 2010-08-26 22:15:26.000000000 +0200
++++ GabeditSrc230/src/Utils/GabeditXYPlot.c 2010-08-26 22:17:15.000000000 +0200
@@ -6607,7 +6607,7 @@ static void gabedit_xyplot_size_allocate
widget->allocation = *allocation;
xyplot=GABEDIT_XYPLOT(widget);
More information about the scm-commits
mailing list