mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

* wtools.h (QuickDialog): Eliminate the "class" field - it's not

Browse Source 
used and it can clash with C++ code.  Adjust all dependencies.
This commit is contained in:
Pavel Roskin 2002-09-03 08:00:02 +00:00
parent 6c2eb32b70
commit d9c6403250
8 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
edit/editcmd.c
View File

@ -352,7 +352,7 @@ void menu_save_mode_cmd (void)
{0}};
static QuickDialog dialog =
{DLG_X, DLG_Y, -1, -1, N_(" Edit Save Mode "), "[Edit Save Mode]",
"esm", widgets};
widgets};
static int i18n_flag = 0;
if (!i18n_flag) {
@ -1062,7 +1062,7 @@ int edit_replace_prompt (WEdit * edit, char *replace_text, int xpos, int ypos)
{
QuickDialog Quick_input =
{CONFIRM_DLG_WIDTH, CONFIRM_DLG_HEIGTH, 0, 0, N_ (" Confirm replace "),
"[Input Line Keys]", "quick_input", 0 /*quick_widgets */ };
"[Input Line Keys]", 0 /*quick_widgets */ };
Quick_input.widgets = quick_widgets;
@ -1138,7 +1138,7 @@ void edit_replace_dialog (WEdit * edit, char **search_text, char **replace_text,
{
QuickDialog Quick_input =
{REPLACE_DLG_WIDTH, REPLACE_DLG_HEIGHT, -1, 0, N_(" Replace "),
"[Input Line Keys]", "quick_input", 0 /*quick_widgets */ };
"[Input Line Keys]", 0 /*quick_widgets */ };
Quick_input.widgets = quick_widgets;
@ -1202,7 +1202,7 @@ void edit_search_dialog (WEdit * edit, char **search_text)
{
QuickDialog Quick_input =
{SEARCH_DLG_WIDTH, SEARCH_DLG_HEIGHT, -1, 0, N_(" Search "),
"[Input Line Keys]", "quick_input", 0 /*quick_widgets */ };
"[Input Line Keys]", 0 /*quick_widgets */ };
Quick_input.widgets = quick_widgets;
@ -2340,7 +2340,7 @@ void edit_mail_dialog (WEdit * edit)
QuickDialog Quick_input =
{50, MAIL_DLG_HEIGHT, -1, 0, N_(" Mail "),
"[Input Line Keys]", "quick_input", 0};
"[Input Line Keys]", 0};
QuickWidget quick_widgets[] =
{

3
edit/editoptions.c
View File

@ -150,8 +150,7 @@ void edit_options_dialog (void)
{
QuickDialog Quick_options =
{OPT_DLG_W, OPT_DLG_H, -1, 0, N_(" Editor options "),
"", "quick_input", 0};
{OPT_DLG_W, OPT_DLG_H, -1, 0, N_(" Editor options "), "", 0};
Quick_options.widgets = quick_widgets;

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2002-09-03 Pavel Roskin <proski@gnu.org>
* wtools.h (QuickDialog): Eliminate the "class" field - it's not
used and it can clash with C++ code. Adjust all dependencies.
* dlg.c (x_set_dialog_title): Completely eliminate. Adjust all
dependencies.

10
src/boxes.c
View File

@ -384,8 +384,9 @@ static QuickWidget conf_widgets [] = {
};
static QuickDialog confirmation =
{ CONFX, CONFY, -1, -1, N_(" Confirmation "), "[Confirmation]", "quick_confirm",
conf_widgets, 0 };
{ CONFX, CONFY, -1, -1, N_(" Confirmation "), "[Confirmation]",
conf_widgets, 0
};
void
confirm_box (void)
@ -736,7 +737,8 @@ static QuickWidget confvfs_widgets [] = {
};
static QuickDialog confvfs_dlg =
{ VFSX, VFSY, -1, -1, N_(" Virtual File System Setting "), "[Virtual FS]", "quick_vfs", confvfs_widgets, 0 };
{ VFSX, VFSY, -1, -1, N_(" Virtual File System Setting "),
"[Virtual FS]", confvfs_widgets, 0 };
void
configure_vfs (void)
@ -791,7 +793,6 @@ cd_dialog (void)
Quick_input.xlen = 57;
Quick_input.title = _("Quick cd");
Quick_input.help = "[Quick cd]";
Quick_input.class = "quick_input";
quick_widgets [0].text = "";
quick_widgets [0].value = 2; /* want cd like completion */
quick_widgets [1].text = _("cd");
@ -836,7 +837,6 @@ symlink_dialog (char *existing, char *new, char **ret_existing, char **ret_new)
Quick_input.ylen = 8;
Quick_input.title = _("Symbolic link");
Quick_input.help = "[File Menu]";
Quick_input.class = "quick_symlink";
Quick_input.i18n = 0;
quick_widgets [0].text = new;
quick_widgets [1].text = _("Symbolic link filename:");

6
src/filegui.c
View File

@ -880,12 +880,6 @@ file_mask_dialog (FileOpContext *ctx, FileOperation operation, char *text,
Quick_input.help = "[Mask Copy/Rename]";
Quick_input.ylen = FMDY;
Quick_input.i18n = 1;
if (operation == OP_COPY) {
Quick_input.class = "quick_file_mask_copy";
} else { /* operation == OP_MOVE */
Quick_input.class = "quick_file_mask_move";
}
Quick_input.widgets = fmd_widgets;
fmd_widgets [FMDI0].text = text;
fmd_widgets [FMDI2].text = def_text;

2
src/hotlist.c
View File

@ -849,7 +849,6 @@ static int add_new_entry_input (char *header, char *text1, char *text2, char *he
Quick_input.xpos = -1;
Quick_input.title = header;
Quick_input.help = help;
Quick_input.class = "hotlist_new_entry";
Quick_input.i18n = 0;
quick_widgets [6].text = text1;
quick_widgets [4].text = text2;
@ -940,7 +939,6 @@ static int add_new_group_input (char *header, char *label, char **result)
Quick_input.xpos = -1;
Quick_input.title = header;
Quick_input.help = "[Hotlist]";
Quick_input.class = "hotlist_new_group";
Quick_input.i18n = 0;
quick_widgets [4].text = label;

1
src/wtools.c
View File

@ -477,7 +477,6 @@ char *real_input_dialog_help (char *header, char *text, char *help, char *def_te
Quick_input.xpos = -1;
Quick_input.title = header;
Quick_input.help = help;
Quick_input.class = "quick_input";
Quick_input.i18n = 0;
quick_widgets [INPUT_INDEX+1].text = text;
quick_widgets [INPUT_INDEX].text = def_text;

1
src/wtools.h
View File

@ -46,7 +46,6 @@ typedef struct {
int xpos, ypos; /* if -1, then center the dialog */
char *title;
char *help;
char *class; /* Used for Tk's class name */
QuickWidget *widgets;
int i18n; /* If true, internationalization has happened */
} QuickDialog;