[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: i_callbacks.c
User: cnieves
Date: 07/04/21 14:34:28
Modified: . i_callbacks.c o_picture.c x_attribedit.c
x_autonumber.c x_compselect.c x_dialog.c
x_fileselect.c x_image.c x_log.c x_multiattrib.c
x_pagesel.c x_print.c x_script.c
Log:
Reverted the previous alternative button order changes.
* src/o_picture.c, src/x_attribedit.c, src/x_autonumber.c,
src/x_compselect.c, src/x_dialog.c, src/x_fileselect.c,
src/x_image.c, src/x_log.c, src/x_multiattrib.c,
src/x_pagesel.c, src/x_print.c, src/x_script.c,
src/i_callbacks.c:
- Reverted the changes below.
gtk_dialog_set_alternative_button_order should have the same
responses as the dialogs.
Revision Changes Path
1.81 +0 -11 eda/geda/gaf/gschem/src/i_callbacks.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: i_callbacks.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/i_callbacks.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- i_callbacks.c 21 Apr 2007 15:32:03 -0000 1.80
+++ i_callbacks.c 21 Apr 2007 18:33:41 -0000 1.81
@@ -1762,17 +1762,6 @@
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
_("Really revert page?"));
-
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
response = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
1.14 +0 -39 eda/geda/gaf/gschem/src/o_picture.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: o_picture.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/o_picture.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- o_picture.c 21 Apr 2007 15:32:03 -0000 1.13
+++ o_picture.c 21 Apr 2007 18:33:41 -0000 1.14
@@ -175,16 +175,6 @@
GTK_STOCK_OPEN,
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->pfswindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
if (w_current->pixbuf_filename)
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(w_current->pfswindow),
w_current->pixbuf_filename);
@@ -206,15 +196,6 @@
GTK_BUTTONS_CLOSE,
_("Failed to load picture: %s"),
error->message);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
/* Wait for any user response */
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -726,17 +707,6 @@
GTK_STOCK_OPEN,
GTK_RESPONSE_ACCEPT,
NULL);
-
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->pfswindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
if (w_current->pixbuf_filename)
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(w_current->pfswindow),
w_current->pixbuf_filename);
@@ -758,15 +728,6 @@
GTK_BUTTONS_CLOSE,
_("Failed to load picture: %s"),
error->message);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
/* Wait for any user response */
gtk_dialog_run (GTK_DIALOG (dialog));
1.11 +0 -9 eda/geda/gaf/gschem/src/x_attribedit.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_attribedit.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_attribedit.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- x_attribedit.c 21 Apr 2007 15:32:03 -0000 1.10
+++ x_attribedit.c 21 Apr 2007 18:33:42 -0000 1.11
@@ -330,15 +330,6 @@
GTK_STOCK_OK,
GTK_RESPONSE_APPLY,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(aewindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
gtk_signal_connect(GTK_OBJECT(aewindow), "response",
GTK_SIGNAL_FUNC(attribute_edit_dialog_response), w_current);
1.13 +0 -9 eda/geda/gaf/gschem/src/x_autonumber.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_autonumber.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_autonumber.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- x_autonumber.c 21 Apr 2007 15:32:03 -0000 1.12
+++ x_autonumber.c 21 Apr 2007 18:33:43 -0000 1.13
@@ -1224,15 +1224,6 @@
GTK_STOCK_APPLY,
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(autonumber_text),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
gtk_window_position (GTK_WINDOW (autonumber_text),
GTK_WIN_POS_MOUSE);
1.19 +0 -10 eda/geda/gaf/gschem/src/x_compselect.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_compselect.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_compselect.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- x_compselect.c 21 Apr 2007 15:32:03 -0000 1.18
+++ x_compselect.c 21 Apr 2007 18:33:43 -0000 1.19
@@ -715,16 +715,6 @@
g_object_set (GTK_DIALOG (compselect)->vbox,
"homogeneous", FALSE,
NULL);
-
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(compselect),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
/* connect dialog to key press event */
g_signal_connect (compselect,
"key_press_event",
1.85 +0 -232 eda/geda/gaf/gschem/src/x_dialog.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_dialog.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_dialog.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- x_dialog.c 21 Apr 2007 16:09:56 -0000 1.84
+++ x_dialog.c 21 Apr 2007 18:33:44 -0000 1.85
@@ -188,16 +188,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tiwindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position(GTK_WINDOW (w_current->tiwindow),
GTK_WIN_POS_NONE);
@@ -514,16 +504,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tewindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_dialog_set_default_response(GTK_DIALOG(w_current->tewindow),
GTK_RESPONSE_ACCEPT);
@@ -880,16 +860,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position(GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
@@ -1268,16 +1238,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position(GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
gtk_dialog_set_default_response(GTK_DIALOG(dialog),
@@ -1491,16 +1451,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->aawindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position(GTK_WINDOW(w_current->aawindow),
GTK_WIN_POS_MOUSE);
@@ -1612,17 +1562,6 @@
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
-
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->trwindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position(GTK_WINDOW (w_current->trwindow),
GTK_WIN_POS_MOUSE);
@@ -1714,16 +1653,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tswindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position(GTK_WINDOW(w_current->tswindow),
GTK_WIN_POS_MOUSE);
@@ -1822,16 +1751,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tswindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position(GTK_WINDOW(w_current->tswindow),
GTK_WIN_POS_MOUSE);
@@ -1928,16 +1847,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->sewindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position(GTK_WINDOW(w_current->sewindow),
GTK_WIN_POS_MOUSE);
@@ -2022,16 +1931,6 @@
GTK_RESPONSE_REJECT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->abwindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position (GTK_WINDOW (w_current->abwindow),
GTK_WIN_POS_MOUSE);
@@ -2125,16 +2024,6 @@
GTK_RESPONSE_REJECT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->cowindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position (GTK_WINDOW (w_current->cowindow),
GTK_WIN_POS_NONE);
@@ -2452,16 +2341,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->clwindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position (GTK_WINDOW (w_current->clwindow),
GTK_WIN_POS_MOUSE);
@@ -2545,16 +2424,6 @@
GTK_RESPONSE_REJECT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->hkwindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position (GTK_WINDOW (w_current->hkwindow),
GTK_WIN_POS_NONE);
@@ -2758,16 +2627,6 @@
GTK_BUTTONS_OK,
msg);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -2796,16 +2655,6 @@
GTK_BUTTONS_OK_CANCEL,
msg);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
r = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -2859,16 +2708,6 @@
NULL);
}
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
/* Pick the current default folder to look for files in */
@@ -3003,16 +2842,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tfindwindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position(GTK_WINDOW(w_current->tfindwindow),
GTK_WIN_POS_MOUSE);
@@ -3111,16 +2940,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->thidewindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position(GTK_WINDOW(w_current->thidewindow),
GTK_WIN_POS_MOUSE);
@@ -3213,16 +3032,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tshowwindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_position(GTK_WINDOW(w_current->tshowwindow),
GTK_WIN_POS_MOUSE);
@@ -3365,16 +3174,6 @@
"Major symbol changes detected in refdes:\n\n%s\n",
refdes_string);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_widget_show(dialog);
g_signal_connect_swapped (dialog, "response",
@@ -3744,16 +3543,6 @@
construct_params);
dialog = CLOSE_CONFIRMATION_DIALOG (object);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
g_object_set (dialog,
/* GtkDialog */
"has-separator", FALSE,
@@ -4038,16 +3827,6 @@
dialog = GTK_WIDGET (g_object_new (TYPE_CLOSE_CONFIRMATION_DIALOG,
"unsaved-page", page,
NULL));
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
/* set default response signal. This is usually triggered by the
"Return" key */
gtk_dialog_set_default_response(GTK_DIALOG(dialog),
@@ -4129,17 +3908,6 @@
dialog = GTK_WIDGET (g_object_new (TYPE_CLOSE_CONFIRMATION_DIALOG,
"unsaved-pages", unsaved_pages,
NULL));
-
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
g_list_free (unsaved_pages);
switch (gtk_dialog_run (GTK_DIALOG (dialog))) {
case GTK_RESPONSE_NO:
1.34 +0 -32 eda/geda/gaf/gschem/src/x_fileselect.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_fileselect.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_fileselect.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- x_fileselect.c 21 Apr 2007 16:16:19 -0000 1.33
+++ x_fileselect.c 21 Apr 2007 18:33:46 -0000 1.34
@@ -174,17 +174,6 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
-
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
x_fileselect_add_preview (GTK_FILE_CHOOSER (dialog));
g_object_set (dialog,
/* GtkFileChooser */
@@ -235,16 +224,6 @@
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
/* set default response signal. This is usually triggered by the
"Return" key */
gtk_dialog_set_default_response(GTK_DIALOG(dialog),
@@ -300,17 +279,6 @@
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
message->str);
-
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_widget_show (dialog);
if (gtk_dialog_run ((GtkDialog*)dialog) == GTK_RESPONSE_YES) {
gtk_widget_destroy(dialog);
1.35 +0 -20 eda/geda/gaf/gschem/src/x_image.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_image.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_image.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- x_image.c 21 Apr 2007 15:32:04 -0000 1.34
+++ x_image.c 21 Apr 2007 18:33:48 -0000 1.35
@@ -373,16 +373,6 @@
filetype, filename, gerror->message
);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -509,16 +499,6 @@
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
/* Add the extra widgets to the dialog*/
gtk_box_pack_start(GTK_BOX(hbox), vbox1, FALSE, FALSE, 10);
gtk_box_pack_start(GTK_BOX(hbox), vbox2, FALSE, FALSE, 10);
1.21 +0 -20 eda/geda/gaf/gschem/src/x_log.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_log.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_log.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- x_log.c 21 Apr 2007 15:32:04 -0000 1.20
+++ x_log.c 21 Apr 2007 18:33:50 -0000 1.21
@@ -64,16 +64,6 @@
log_dialog = GTK_WIDGET (g_object_new (TYPE_LOG,
NULL));
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(log_dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
g_signal_connect (log_dialog,
"response",
G_CALLBACK (x_log_callback_response),
@@ -248,16 +238,6 @@
"has-separator", TRUE,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(log),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
/* create a scrolled window for the textview */
scrolled_win = GTK_WIDGET (
g_object_new (GTK_TYPE_SCROLLED_WINDOW,
1.8 +0 -31 eda/geda/gaf/gschem/src/x_multiattrib.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_multiattrib.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_multiattrib.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- x_multiattrib.c 21 Apr 2007 15:32:04 -0000 1.7
+++ x_multiattrib.c 21 Apr 2007 18:33:52 -0000 1.8
@@ -59,16 +59,6 @@
"object", object,
NULL));
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_window_set_transient_for(GTK_WINDOW(dialog),
GTK_WINDOW(toplevel->main_window));
@@ -660,17 +650,6 @@
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
_("Attributes with empty name are not allowed. Please set a name."));
-
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
return;
@@ -1337,16 +1316,6 @@
"has-separator", TRUE,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(multiattrib),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
multiattrib->toplevel = NULL;
multiattrib->object = NULL;
1.17 +0 -10 eda/geda/gaf/gschem/src/x_pagesel.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_pagesel.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_pagesel.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- x_pagesel.c 21 Apr 2007 15:32:04 -0000 1.16
+++ x_pagesel.c 21 Apr 2007 18:33:56 -0000 1.17
@@ -383,16 +383,6 @@
"has-separator", TRUE,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(pagesel),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
/* create the model for the treeview */
store = (GtkTreeModel*)gtk_tree_store_new (NUM_COLUMNS,
G_TYPE_POINTER, /* page */
1.33 +0 -40 eda/geda/gaf/gschem/src/x_print.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_print.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_print.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- x_print.c 21 Apr 2007 15:32:04 -0000 1.32
+++ x_print.c 21 Apr 2007 18:34:06 -0000 1.33
@@ -95,16 +95,6 @@
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT, NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(filechooser),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
filename = gtk_entry_get_text (GTK_ENTRY (dialog->fnfield));
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filechooser), filename);
@@ -315,16 +305,6 @@
"title", _("Print..."),
"modal", TRUE, "destroy-with-parent", TRUE, NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
/* Connect key-press event */
g_signal_connect (dialog,
"key_press_event",
@@ -736,16 +716,6 @@
"type", type,
"usefile", usefile,
NULL));
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_widget_show_all (GTK_WIDGET (dialog));
gtk_dialog_set_default_response(GTK_DIALOG(dialog),
@@ -811,16 +781,6 @@
_("Error printing to file '%s'\n"
"Check the log window for more information"),
destination);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
gtk_dialog_run (GTK_DIALOG (popup_message));
}
else
1.14 +0 -10 eda/geda/gaf/gschem/src/x_script.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_script.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/src/x_script.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- x_script.c 21 Apr 2007 15:32:04 -0000 1.13
+++ x_script.c 21 Apr 2007 18:34:14 -0000 1.14
@@ -55,16 +55,6 @@
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
- /* Set the alternative button order (ok, cancel, help) for other systems */
- gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->sowindow),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_NO,
- GTK_RESPONSE_CANCEL,
- GTK_RESPONSE_HELP,
- -1);
-#endif
-
if (gtk_dialog_run (GTK_DIALOG (w_current->sowindow)) == GTK_RESPONSE_ACCEPT) {
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (w_current->sowindow));
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs