* edit.c (edit_execute_cmd) [GTK]: Disable user menu - it

doesn't work.
(user_menu) [GTK]: Disable.
* gtkedit.c (tb_items): Use complete words. Disable pull-down
menu.
This commit is contained in:
Pavel Roskin 2001-06-13 07:49:39 +00:00
parent 869afff53c
commit 6d83120d2f
3 changed files with 16 additions and 2 deletions

View File

@ -1,3 +1,11 @@
2001-06-13 Pavel Roskin <proski@gnu.org>
* edit.c (edit_execute_cmd) [GTK]: Disable user menu - it
doesn't work.
(user_menu) [GTK]: Disable.
* gtkedit.c (tb_items): Use complete words. Disable pull-down
menu.
2001-06-09 Pavel Roskin <proski@gnu.org> 2001-06-09 Pavel Roskin <proski@gnu.org>
* editcmd.c (catstrs): Use interactive_display() without * editcmd.c (catstrs): Use interactive_display() without

View File

@ -2594,6 +2594,7 @@ int edit_execute_cmd (WEdit * edit, int command, int char_for_insertion)
case CK_Match_Bracket: case CK_Match_Bracket:
edit_goto_matching_bracket (edit); edit_goto_matching_bracket (edit);
break; break;
#ifndef GTK
case CK_User_Menu: case CK_User_Menu:
if (edit_one_file) { if (edit_one_file) {
message (1, MSG_ERROR, _("User menu available only in mcedit invoked from mc")); message (1, MSG_ERROR, _("User menu available only in mcedit invoked from mc"));
@ -2602,6 +2603,7 @@ int edit_execute_cmd (WEdit * edit, int command, int char_for_insertion)
else else
user_menu (edit); user_menu (edit);
break; break;
#endif /* !GTK */
#ifdef MIDNIGHT #ifdef MIDNIGHT
case CK_Sort: case CK_Sort:
edit_sort_cmd (edit); edit_sort_cmd (edit);
@ -2754,6 +2756,7 @@ void edit_execute_macro (WEdit * edit, struct macro macro[], int n)
edit_update_screen (edit); edit_update_screen (edit);
} }
#ifndef GTK
/* User edit menu, like user menu (F2) but only in editor. */ /* User edit menu, like user menu (F2) but only in editor. */
void user_menu (WEdit *edit) void user_menu (WEdit *edit)
{ {
@ -2802,3 +2805,4 @@ void user_menu (WEdit *edit)
edit->force |= REDRAW_COMPLETELY; edit->force |= REDRAW_COMPLETELY;
return; return;
} }
#endif /* !GTK */

View File

@ -1248,13 +1248,15 @@ static TbItems tb_items[] =
{"F1", N_("Help"), N_("Interactive help browser"), GNOME_STOCK_MENU_BLANK, 0, NULL}, {"F1", N_("Help"), N_("Interactive help browser"), GNOME_STOCK_MENU_BLANK, 0, NULL},
{"F2", N_("Save"), N_("Save to current file name"), GNOME_STOCK_MENU_SAVE, gtk_edit_save_file, NULL}, {"F2", N_("Save"), N_("Save to current file name"), GNOME_STOCK_MENU_SAVE, gtk_edit_save_file, NULL},
{"F3", N_("Mark"), N_("Toggle In/Off invisible marker to highlight text"), GNOME_STOCK_MENU_BLANK, gtk_edit_toggle_mark, NULL}, {"F3", N_("Mark"), N_("Toggle In/Off invisible marker to highlight text"), GNOME_STOCK_MENU_BLANK, gtk_edit_toggle_mark, NULL},
{"F4", N_("Replc"), N_("Find and replace strings/regular expressions"), GNOME_STOCK_MENU_SRCHRPL, gtk_edit_replace, NULL}, {"F4", N_("Replace"), N_("Find and replace strings/regular expressions"), GNOME_STOCK_MENU_SRCHRPL, gtk_edit_replace, NULL},
{"F5", N_("Copy"), N_("Copy highlighted block to cursor position"), GNOME_STOCK_MENU_COPY, gtk_edit_copy, NULL}, {"F5", N_("Copy"), N_("Copy highlighted block to cursor position"), GNOME_STOCK_MENU_COPY, gtk_edit_copy, NULL},
{"F6", N_("Move"), N_("Move highlighted block to cursor position"), GNOME_STOCK_MENU_BLANK, gtk_edit_move, NULL}, {"F6", N_("Move"), N_("Move highlighted block to cursor position"), GNOME_STOCK_MENU_BLANK, gtk_edit_move, NULL},
{"F7", N_("Find"), N_("Find strings/regular expressions"), GNOME_STOCK_MENU_SEARCH, gtk_edit_search, NULL}, {"F7", N_("Find"), N_("Find strings/regular expressions"), GNOME_STOCK_MENU_SEARCH, gtk_edit_search, NULL},
{"F8", N_("Dlete"), N_("Delete highlighted text"), GNOME_STOCK_MENU_BLANK, gtk_edit_delete, NULL}, {"F8", N_("Delete"), N_("Delete highlighted text"), GNOME_STOCK_MENU_BLANK, gtk_edit_delete, NULL},
#if 0
{"F9", N_("Menu"), N_("Pull down menu"), GNOME_STOCK_MENU_BLANK, /* gtk_edit_menu*/ 0, NULL}, {"F9", N_("Menu"), N_("Pull down menu"), GNOME_STOCK_MENU_BLANK, /* gtk_edit_menu*/ 0, NULL},
#endif
{"F10", N_("Quit"), N_("Exit editor"), GNOME_STOCK_MENU_QUIT, gtk_edit_quit, NULL}, {"F10", N_("Quit"), N_("Exit editor"), GNOME_STOCK_MENU_QUIT, gtk_edit_quit, NULL},
{0, 0, 0, 0, 0, 0} {0, 0, 0, 0, 0, 0}
}; };