From 2453f82bbd72e14e2204a43b20e31513a5f5fc33 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 12 Aug 2012 19:26:01 +0400 Subject: [PATCH] (editcmd_dialog_raw_key_query): take gboolean instead of boolean. Signed-off-by: Andrew Borodin --- src/editor/editcmd.c | 11 +++++++---- src/editor/editcmd_dialogs.c | 9 ++++++--- src/editor/editcmd_dialogs.h | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c index 75b08a444..77198554b 100644 --- a/src/editor/editcmd.c +++ b/src/editor/editcmd.c @@ -1764,7 +1764,7 @@ edit_delete_macro_cmd (WEdit * edit) { int hotkey; - hotkey = editcmd_dialog_raw_key_query (_("Delete macro"), _("Press macro hotkey:"), 1); + hotkey = editcmd_dialog_raw_key_query (_("Delete macro"), _("Press macro hotkey:"), TRUE); if (hotkey != 0 && !edit_delete_macro (edit, hotkey)) message (D_ERROR, _("Delete macro"), _("Macro not deleted")); @@ -1821,7 +1821,8 @@ edit_store_macro_cmd (WEdit * edit) gboolean have_macro = FALSE; char *skeyname = NULL; - hotkey = editcmd_dialog_raw_key_query (_("Save macro"), _("Press the macro's new hotkey:"), 1); + hotkey = + editcmd_dialog_raw_key_query (_("Save macro"), _("Press the macro's new hotkey:"), TRUE); if (hotkey == ESC_CHAR) return FALSE; @@ -3417,8 +3418,10 @@ edit_select_codepage_cmd (WEdit * edit) void edit_insert_literal_cmd (WEdit * edit) { - int char_for_insertion = editcmd_dialog_raw_key_query (_("Insert literal"), - _("Press any key:"), 0); + int char_for_insertion; + + char_for_insertion = editcmd_dialog_raw_key_query (_("Insert literal"), + _("Press any key:"), FALSE); edit_execute_key_command (edit, -1, ascii_alpha_to_cntrl (char_for_insertion)); } diff --git a/src/editor/editcmd_dialogs.c b/src/editor/editcmd_dialogs.c index de2fe0453..742eb6940 100644 --- a/src/editor/editcmd_dialogs.c +++ b/src/editor/editcmd_dialogs.c @@ -341,11 +341,14 @@ editcmd_dialog_search_show (WEdit * edit) and Esc are cannot returned */ int -editcmd_dialog_raw_key_query (const char *heading, const char *query, int cancel) +editcmd_dialog_raw_key_query (const char *heading, const char *query, gboolean cancel) { - int w = str_term_width1 (query) + 7; + int w; + struct Dlg_head *raw_dlg; - struct Dlg_head *raw_dlg = + w = str_term_width1 (query) + 7; + + raw_dlg = create_dlg (TRUE, 0, 0, 7, w, dialog_colors, editcmd_dialog_raw_key_query_cb, NULL, NULL, heading, DLG_CENTER | DLG_TRYUP | DLG_WANT_TAB); add_widget (raw_dlg, input_new (3 - cancel, w - 5, input_get_default_colors (), diff --git a/src/editor/editcmd_dialogs.h b/src/editor/editcmd_dialogs.h index 5a39c157f..2d06e62c9 100644 --- a/src/editor/editcmd_dialogs.h +++ b/src/editor/editcmd_dialogs.h @@ -29,7 +29,7 @@ void editcmd_dialog_replace_show (WEdit *, const char *, const char *, char **, gboolean editcmd_dialog_search_show (WEdit * edit); -int editcmd_dialog_raw_key_query (const char *, const char *, int); +int editcmd_dialog_raw_key_query (const char *heading, const char *query, gboolean cancel); void editcmd_dialog_completion_show (WEdit *, int, int, struct selection *, int); -- 2.11.4.GIT