mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-22 20:36:50 +03:00
Some files in /gnome was not copied on "make dist"
Warning in gnome/gmain.c suppressed "VERSION." is included instead of "VERSION" for Borland C++, otherwise it assumes VERSION.h Mouse is not enabled for Windows NT edition Warning about missing hotlist was shown incorrectly on NT and Linux console
This commit is contained in:
parent
e3c5d28d4a
commit
46e8d43127
@ -35,6 +35,7 @@ GNOMEHDRS = \
|
||||
gmain.h \
|
||||
gscreen.h \
|
||||
gwidget.h \
|
||||
gdesktop.h \
|
||||
gconf.h \
|
||||
gcmd.h \
|
||||
gmc-chargrid.h
|
||||
@ -76,7 +77,13 @@ OBJS = $(LOBJS) $(OOBJS) \
|
||||
# Distribution variables
|
||||
#
|
||||
|
||||
PIXMAPS = directory.xpm link.xpm
|
||||
PIXMAPS = \
|
||||
dev.xpm \
|
||||
directory-ok.xpm \
|
||||
directory.xpm \
|
||||
link.xpm \
|
||||
multi-ok.xpm \
|
||||
multi.xpm
|
||||
|
||||
DISTGNOME = Makefile.in gnome.TODO layout $(PIXMAPS) $(GNOMESRCS) $(GNOMEHDRS)
|
||||
|
||||
|
@ -324,7 +324,7 @@ dialog_panel_callback (struct Dlg_head *h, int id, int msg)
|
||||
WInput *in;
|
||||
|
||||
if (msg == DLG_KEY && id == '\n'){
|
||||
if (h->current->widget->callback == panel_callback)
|
||||
if (h->current->widget->callback == (callback_fn) panel_callback)
|
||||
return 0;
|
||||
|
||||
/*
|
||||
|
@ -30,7 +30,11 @@
|
||||
#ifndef __CONFIG_HPP //Prevent multiple includes
|
||||
#define __CONFIG_HPP
|
||||
|
||||
#include <../VERSION>
|
||||
#ifndef __BORLANDC__
|
||||
# include <../VERSION>
|
||||
#else
|
||||
# include <../VERSION.>
|
||||
#endif
|
||||
|
||||
#ifndef WIN32
|
||||
# define WIN32
|
||||
|
@ -98,7 +98,7 @@ void handle_console (unsigned char action)
|
||||
win32APICALL(SetConsoleScreenBufferSize(hNew, csbi.dwSize));
|
||||
|
||||
win32APICALL(SetConsoleActiveScreenBuffer(hNew)); // ... that becomes standard handle
|
||||
win32APICALL(SetConsoleMode(hNew, ENABLE_PROCESSED_INPUT | ENABLE_MOUSE_INPUT));
|
||||
win32APICALL(SetConsoleMode(hNew, ENABLE_PROCESSED_INPUT));
|
||||
win32APICALL(SetStdHandle(STD_OUTPUT_HANDLE, hNew));
|
||||
break;
|
||||
|
||||
|
20
src/main.c
20
src/main.c
@ -2869,16 +2869,6 @@ int main (int argc, char *argv [])
|
||||
init_subshell ();
|
||||
# endif
|
||||
|
||||
/* The directory hot list */
|
||||
load_hotlist ();
|
||||
|
||||
if (show_change_notice){
|
||||
message (1, " Notice ",
|
||||
" The Midnight Commander configuration files \n"
|
||||
" are now stored in the ~/.mc directory, the \n"
|
||||
" files have been moved now\n");
|
||||
}
|
||||
|
||||
# ifndef HAVE_X
|
||||
/* Removing this from the X code let's us type C-c */
|
||||
load_key_defs ();
|
||||
@ -2891,6 +2881,16 @@ int main (int argc, char *argv [])
|
||||
}
|
||||
# endif
|
||||
|
||||
/* The directory hot list */
|
||||
load_hotlist ();
|
||||
|
||||
if (show_change_notice){
|
||||
message (1, " Notice ",
|
||||
" The Midnight Commander configuration files \n"
|
||||
" are now stored in the ~/.mc directory, the \n"
|
||||
" files have been moved now\n");
|
||||
}
|
||||
|
||||
# ifdef HAVE_SUBSHELL_SUPPORT
|
||||
if (use_subshell){
|
||||
prompt = strip_ctrl_codes (subshell_prompt);
|
||||
|
Loading…
Reference in New Issue
Block a user