* screen.c (user_file_menu_cmd) [HAVE_X]: Disable.
(panel_callback) [HAVE_X]: Don't define labels, they are unused. * user.c [HAVE_X]: Disable all user meny code.
Этот коммит содержится в:
родитель
6d83120d2f
Коммит
c2f8f8d935
@ -1,5 +1,9 @@
|
|||||||
2001-06-13 Pavel Roskin <proski@gnu.org>
|
2001-06-13 Pavel Roskin <proski@gnu.org>
|
||||||
|
|
||||||
|
* screen.c (user_file_menu_cmd) [HAVE_X]: Disable.
|
||||||
|
(panel_callback) [HAVE_X]: Don't define labels, they are unused.
|
||||||
|
* user.c [HAVE_X]: Disable all user meny code.
|
||||||
|
|
||||||
* color.c (color_table): Make static. Only use in text edition.
|
* color.c (color_table): Make static. Only use in text edition.
|
||||||
* xtty.h: Remove unused definitions.
|
* xtty.h: Remove unused definitions.
|
||||||
|
|
||||||
|
16
src/screen.c
16
src/screen.c
@ -2371,7 +2371,11 @@ panel_key (WPanel *panel, int key)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void user_file_menu_cmd (void) { user_menu_cmd (NULL); }
|
#ifndef HAVE_X
|
||||||
|
void user_file_menu_cmd (void) {
|
||||||
|
user_menu_cmd (NULL);
|
||||||
|
}
|
||||||
|
#endif /* !HAVE_X */
|
||||||
|
|
||||||
static int
|
static int
|
||||||
panel_callback (Dlg_head *h, WPanel *panel, int msg, int par)
|
panel_callback (Dlg_head *h, WPanel *panel, int msg, int par)
|
||||||
@ -2379,16 +2383,8 @@ panel_callback (Dlg_head *h, WPanel *panel, int msg, int par)
|
|||||||
switch (msg){
|
switch (msg){
|
||||||
case WIDGET_INIT:
|
case WIDGET_INIT:
|
||||||
#ifdef HAVE_X
|
#ifdef HAVE_X
|
||||||
define_label (h, (Widget *)panel, 1, _("Help"), help_cmd);
|
|
||||||
define_label (h, (Widget *)panel, 2, _("Menu"), user_file_menu_cmd);
|
|
||||||
define_label (h, (Widget *)panel, 3, _("View"), view_panel_cmd);
|
|
||||||
define_label (h, (Widget *)panel, 4, _("Edit"), edit_panel_cmd);
|
|
||||||
define_label (h, (Widget *)panel, 5, _("Copy"), copy_cmd);
|
|
||||||
define_label (h, (Widget *)panel, 6, _("RenMov"), ren_cmd);
|
|
||||||
define_label (h, (Widget *)panel, 7, _("Mkdir"), mkdir_panel_cmd);
|
|
||||||
define_label (h, (Widget *)panel, 8, _("Delete"), delete_cmd);
|
|
||||||
x_create_panel (h, h->wdata, panel);
|
x_create_panel (h, h->wdata, panel);
|
||||||
#endif
|
#endif /* !HAVE_X */
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
case WIDGET_DRAW:
|
case WIDGET_DRAW:
|
||||||
|
@ -258,6 +258,7 @@ char *expand_format (char c, int quote)
|
|||||||
return g_strdup ("");
|
return g_strdup ("");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef HAVE_X
|
||||||
/* Checks for shell patterns definition */
|
/* Checks for shell patterns definition */
|
||||||
char *check_patterns (char *p)
|
char *check_patterns (char *p)
|
||||||
{
|
{
|
||||||
@ -788,3 +789,4 @@ void user_menu_cmd (WEdit *edit_widget)
|
|||||||
g_free (entries);
|
g_free (entries);
|
||||||
g_free (data);
|
g_free (data);
|
||||||
}
|
}
|
||||||
|
#endif /* !HAVE_X */
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user