diff --git a/gschem/src/x_attribedit.c b/gschem/src/x_attribedit.c
index 56f9be6..6718a93 100644
--- a/gschem/src/x_attribedit.c
+++ b/gschem/src/x_attribedit.c
@@ -267,7 +267,7 @@ void attribute_edit_dialog_response(GtkWidget *w, gint
response,
case GTK_RESPONSE_APPLY:
attrib_edit_dialog_ok(NULL, w_current);
break;
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
i_set_state(w_current, SELECT);
gtk_grab_remove(w_current->aewindow);
@@ -332,18 +332,20 @@ void attrib_edit_dialog (GSCHEM_TOPLEVEL *w_current,
OBJECT *attr_obj, int flag)
GTK_DIALOG_MODAL,
"singleattrib", w_current,
GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_OK,
GTK_RESPONSE_APPLY,
NULL);
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(aewindow),
GTK_RESPONSE_APPLY,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
- gtk_signal_connect(GTK_OBJECT(aewindow), "response",
- GTK_SIGNAL_FUNC(attribute_edit_dialog_response),
w_current);
+ gtk_signal_connect(GTK_OBJECT(aewindow),
+ "response",
+ GTK_SIGNAL_FUNC(attribute_edit_dialog_response),
+ w_current);
gtk_window_set_position (GTK_WINDOW (aewindow), GTK_WIN_POS_MOUSE);
@@ -386,7 +388,8 @@ void attrib_edit_dialog (GSCHEM_TOPLEVEL *w_current, OBJECT
*attr_obj, int flag)
(GtkAttachOptions) (0), 0, 0);
attrib_combo_entry = GTK_COMBO (attrib_combo)->entry;
gtk_widget_ref (attrib_combo_entry);
- gtk_object_set_data_full (GTK_OBJECT (aewindow), "attrib_combo_entry",
attrib_combo_entry,
+ gtk_object_set_data_full (GTK_OBJECT (aewindow), "attrib_combo_entry",
+ attrib_combo_entry,
(GtkDestroyNotify) gtk_widget_unref);
/* Value entry */
diff --git a/gschem/src/x_autonumber.c b/gschem/src/x_autonumber.c
index daee8db..03dc3c8 100644
--- a/gschem/src/x_autonumber.c
+++ b/gschem/src/x_autonumber.c
@@ -1140,7 +1140,7 @@ void autonumber_text_response(GtkWidget * widget, gint
response,
autonumber_text_autonumber(autotext);
}
break;
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
gtk_widget_destroy(autotext->dialog);
autotext->dialog = NULL;
@@ -1221,14 +1221,14 @@ GtkWidget* autonumber_create_dialog(GSCHEM_TOPLEVEL
*w_current)
0, /* not modal */
"autonumber", w_current,
GTK_STOCK_CLOSE,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_APPLY,
GTK_RESPONSE_ACCEPT,
NULL);
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(autonumber_text),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position (GTK_WINDOW (autonumber_text),
diff --git a/gschem/src/x_dialog.c b/gschem/src/x_dialog.c
index fadf6d4..6ab7c2c 100644
--- a/gschem/src/x_dialog.c
+++ b/gschem/src/x_dialog.c
@@ -145,7 +145,7 @@ void text_input_dialog_response(GtkWidget * widget, gint
response, GSCHEM_TOPLEV
case GTK_RESPONSE_ACCEPT:
text_input_dialog_apply(widget, w_current);
break;
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
i_set_state(w_current, SELECT);
i_update_toolbar(w_current);
@@ -178,7 +178,7 @@ void text_input_dialog (GSCHEM_TOPLEVEL *w_current)
0, /* NON_MODAL */
"text-entry",
w_current,
GTK_STOCK_CLOSE,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_APPLY,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -186,7 +186,7 @@ void text_input_dialog (GSCHEM_TOPLEVEL *w_current)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tiwindow),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position(GTK_WINDOW (w_current->tiwindow),
@@ -457,7 +457,7 @@ void text_edit_dialog_response(GtkWidget * widget, gint
response, GSCHEM_TOPLEVE
case GTK_RESPONSE_ACCEPT:
text_edit_dialog_ok(widget, w_current);
break;
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
/* void */
break;
@@ -500,7 +500,7 @@ void text_edit_dialog (GSCHEM_TOPLEVEL *w_current, const
char *string, int text_
GTK_DIALOG_MODAL,
"text-edit",
w_current,
GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -508,7 +508,7 @@ void text_edit_dialog (GSCHEM_TOPLEVEL *w_current, const
char *string, int text_
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tewindow),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_dialog_set_default_response(GTK_DIALOG(w_current->tewindow),
@@ -813,7 +813,7 @@ void line_type_dialog_response(GtkWidget *widget, gint
response,
struct line_type_data *line_type_data)
{
switch (response) {
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
/* void */
break;
@@ -860,7 +860,7 @@ void line_type_dialog (GSCHEM_TOPLEVEL *w_current, GList
*objects)
GTK_DIALOG_MODAL,
"line-type", w_current,
GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -868,7 +868,7 @@ void line_type_dialog (GSCHEM_TOPLEVEL *w_current, GList
*objects)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position(GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
@@ -1194,7 +1194,7 @@ void fill_type_dialog_response(GtkWidget *widget, gint
response,
struct fill_type_data *fill_type_data)
{
switch (response) {
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
/* void */
break;
@@ -1245,7 +1245,7 @@ void fill_type_dialog(GSCHEM_TOPLEVEL *w_current, GList
*objects)
GTK_DIALOG_MODAL,
"fill-type", w_current,
GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -1253,7 +1253,7 @@ void fill_type_dialog(GSCHEM_TOPLEVEL *w_current, GList
*objects)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position(GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
@@ -1428,7 +1428,7 @@ void arc_angle_dialog_response(GtkWidget *w, gint
response,
OBJECT *arc_object = NULL;
switch (response) {
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
/* void */
break;
@@ -1482,7 +1482,7 @@ void arc_angle_dialog (GSCHEM_TOPLEVEL *w_current, OBJECT
*arc_object)
GTK_DIALOG_MODAL,
"arc-angle",
w_current,
GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -1490,7 +1490,7 @@ void arc_angle_dialog (GSCHEM_TOPLEVEL *w_current, OBJECT
*arc_object)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->aawindow),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position(GTK_WINDOW(w_current->aawindow),
@@ -1587,7 +1587,7 @@ void translate_dialog_response(GtkWidget *widget, gint
response,
gchar *string;
switch (response) {
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
/* void */
break;
@@ -1625,7 +1625,7 @@ void translate_dialog (GSCHEM_TOPLEVEL *w_current)
GTK_DIALOG_MODAL,
"translate",
w_current,
GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -1633,7 +1633,7 @@ void translate_dialog (GSCHEM_TOPLEVEL *w_current)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->trwindow),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position(GTK_WINDOW (w_current->trwindow),
@@ -1692,7 +1692,7 @@ void text_size_dialog_response(GtkWidget *w, gint
response,
w_current->toplevel->page_current->CHANGED=1;
o_undo_savestate(w_current, UNDO_ALL);
break;
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
/* void */
break;
@@ -1723,7 +1723,7 @@ void text_size_dialog (GSCHEM_TOPLEVEL *w_current)
GTK_DIALOG_MODAL,
"text-size",
w_current,
GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -1731,7 +1731,7 @@ void text_size_dialog (GSCHEM_TOPLEVEL *w_current)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tswindow),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position(GTK_WINDOW(w_current->tswindow),
@@ -1797,7 +1797,7 @@ void snap_size_dialog_response(GtkWidget *w, gint
response,
w_current->toplevel->page_current->CHANGED=1; /* maybe remove those two
lines */
o_undo_savestate(w_current, UNDO_ALL);
break;
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
/* void */
break;
@@ -1828,7 +1828,7 @@ void snap_size_dialog (GSCHEM_TOPLEVEL *w_current)
GTK_DIALOG_MODAL,
"snap-size",
w_current,
GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -1836,7 +1836,7 @@ void snap_size_dialog (GSCHEM_TOPLEVEL *w_current)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tswindow),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position(GTK_WINDOW(w_current->tswindow),
@@ -1893,7 +1893,7 @@ void slot_edit_dialog_response(GtkWidget *widget, gint
response, GSCHEM_TOPLEVEL
gchar *string = NULL;
switch (response) {
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
/* void */
break;
@@ -1931,7 +1931,7 @@ void slot_edit_dialog (GSCHEM_TOPLEVEL *w_current, const
char *string)
GTK_DIALOG_MODAL,
"slot-edit",
w_current,
GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -1939,7 +1939,7 @@ void slot_edit_dialog (GSCHEM_TOPLEVEL *w_current, const
char *string)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->sewindow),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position(GTK_WINDOW(w_current->sewindow),
@@ -1996,7 +1996,7 @@ void about_dialog_response(GtkWidget *w, gint response,
GSCHEM_TOPLEVEL *w_current)
{
switch (response) {
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
/* void */
break;
@@ -2024,7 +2024,7 @@ void about_dialog (GSCHEM_TOPLEVEL *w_current)
GTK_DIALOG_MODAL,
"about", w_current,
GTK_STOCK_CLOSE,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
NULL);
gtk_window_position (GTK_WINDOW (w_current->abwindow),
@@ -2121,7 +2121,7 @@ void coord_dialog (GSCHEM_TOPLEVEL *w_current, int x, int
y)
0, /* Not modal
GTK_DIALOG_MODAL */
"coord", w_current,
GTK_STOCK_CLOSE,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
NULL);
gtk_window_position (GTK_WINDOW (w_current->cowindow),
@@ -2424,7 +2424,7 @@ void color_edit_dialog_apply(GtkWidget *w,
GSCHEM_TOPLEVEL *w_current)
void color_edit_dialog_response(GtkWidget *widget, gint response,
GSCHEM_TOPLEVEL *w_current)
{
switch (response) {
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
gtk_widget_destroy(w_current->clwindow);
w_current->clwindow = NULL;
@@ -2454,7 +2454,7 @@ void color_edit_dialog (GSCHEM_TOPLEVEL *w_current)
0, /* nonmodal
dialog */
"color-edit",
w_current,
GTK_STOCK_CLOSE,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_APPLY,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -2462,7 +2462,7 @@ void color_edit_dialog (GSCHEM_TOPLEVEL *w_current)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->clwindow),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position (GTK_WINDOW (w_current->clwindow),
@@ -2507,7 +2507,7 @@ void x_dialog_hotkeys_response(GtkWidget *w, gint
response,
GSCHEM_TOPLEVEL *w_current)
{
switch(response) {
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
/* void */
break;
@@ -2543,7 +2543,7 @@ void x_dialog_hotkeys (GSCHEM_TOPLEVEL *w_current)
0, /* not modal */
"hotkeys", w_current,
GTK_STOCK_CLOSE,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
NULL);
gtk_window_position (GTK_WINDOW (w_current->hkwindow),
@@ -2882,7 +2882,7 @@ void find_text_dialog_response(GtkWidget *w, gint
response,
}
start_find = 0;
break;
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
close = 1;
break;
@@ -2923,7 +2923,7 @@ void find_text_dialog(GSCHEM_TOPLEVEL *w_current)
0, /* not modal
GTK_DIALOG_MODAL */
"find-text",
w_current,
GTK_STOCK_CLOSE,
-
GTK_RESPONSE_REJECT,
+
GTK_RESPONSE_CANCEL,
GTK_STOCK_FIND,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -2931,7 +2931,7 @@ void find_text_dialog(GSCHEM_TOPLEVEL *w_current)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tfindwindow),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position(GTK_WINDOW(w_current->tfindwindow),
@@ -3002,7 +3002,7 @@ void hide_text_dialog_response(GtkWidget *w, gint
response,
o_edit_hide_specific_text(w_current,
w_current->toplevel->page_current->object_list,
string);
break;
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
gtk_widget_destroy(w_current->thidewindow);
w_current->thidewindow = NULL;
@@ -3028,7 +3028,7 @@ void hide_text_dialog(GSCHEM_TOPLEVEL * w_current)
0, /* not modal
GTK_DIALOG_MODAL, */
"hide-text",
w_current,
GTK_STOCK_CLOSE,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
GTK_STOCK_APPLY,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -3036,7 +3036,7 @@ void hide_text_dialog(GSCHEM_TOPLEVEL * w_current)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->thidewindow),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position(GTK_WINDOW(w_current->thidewindow),
@@ -3101,7 +3101,7 @@ void show_text_dialog_response(GtkWidget *widget, gint
response,
o_edit_show_specific_text(w_current,
w_current->toplevel->page_current->object_list,
string);
break;
- case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
gtk_widget_destroy(w_current->tshowwindow);
w_current->tshowwindow = NULL;
@@ -3127,7 +3127,7 @@ void show_text_dialog(GSCHEM_TOPLEVEL * w_current)
0, /* not modal
GTK_DIALOG_MODAL, */
"show-text",
w_current,
GTK_STOCK_CLOSE,
-
GTK_RESPONSE_REJECT,
+
GTK_RESPONSE_CANCEL,
GTK_STOCK_APPLY,
GTK_RESPONSE_ACCEPT,
NULL);
@@ -3135,7 +3135,7 @@ void show_text_dialog(GSCHEM_TOPLEVEL * w_current)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tshowwindow),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
gtk_window_position(GTK_WINDOW(w_current->tshowwindow),
diff --git a/gschem/src/x_print.c b/gschem/src/x_print.c
index 7ab38fd..5a16a11 100644
--- a/gschem/src/x_print.c
+++ b/gschem/src/x_print.c
@@ -385,7 +385,7 @@ print_dialog_init (PrintDialog * dialog)
/* Add "Cancel" and "Print" buttons */
gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
print_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
GTK_STOCK_PRINT, GTK_RESPONSE_ACCEPT);
gtk_widget_grab_focus(print_button);
@@ -393,7 +393,7 @@ print_dialog_init (PrintDialog * dialog)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT,
- GTK_RESPONSE_REJECT,
+ GTK_RESPONSE_CANCEL,
-1);
/* Set initial radiobutton selection */
_______________________________________________
geda-dev mailing list
[email protected]
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
