* background.c: Include "x.h".

* panelize.c: Likewise.
* treestore.c: Likewise.
* user.c: Likewise.
* util.c: Likewise.
* command.c: Reorder includes. Include "x.h".
* complete.c: Likewise.
* find.c: Likewise.
* user.h: Declare user_menu_cmd() inconditionally.
* i18n.h [GAVE_GNOME]: Remove code that is now in x.h.
This commit is contained in:
Pavel Roskin 2001-06-15 23:37:59 +00:00
parent 7ba1e1aa4c
commit 7205d0210c
11 changed files with 25 additions and 9 deletions

View File

@ -1,5 +1,16 @@
2001-06-15 Pavel Roskin <proski@gnu.org> 2001-06-15 Pavel Roskin <proski@gnu.org>
* background.c: Include "x.h".
* panelize.c: Likewise.
* treestore.c: Likewise.
* user.c: Likewise.
* util.c: Likewise.
* command.c: Reorder includes. Include "x.h".
* complete.c: Likewise.
* find.c: Likewise.
* user.h: Declare user_menu_cmd() inconditionally.
* i18n.h [GAVE_GNOME]: Remove code that is now in x.h.
* tty.h [HAVE_X]: Define beep() to gdk_beep(). * tty.h [HAVE_X]: Define beep() to gdk_beep().
2001-06-14 Pavel Roskin <proski@gnu.org> 2001-06-14 Pavel Roskin <proski@gnu.org>

View File

@ -37,6 +37,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include "tty.h" #include "tty.h"
#include "x.h"
#include "global.h" #include "global.h"
#include "dlg.h" #include "dlg.h"
#include "widget.h" #include "widget.h"

View File

@ -23,8 +23,9 @@
#include <config.h> #include <config.h>
#include <errno.h> #include <errno.h>
#include "tty.h"
#include <string.h> #include <string.h>
#include "tty.h"
#include "x.h"
#include "global.h" /* home_dir */ #include "global.h" /* home_dir */
#include "dlg.h" #include "dlg.h"
#include "widget.h" #include "widget.h"

View File

@ -20,7 +20,6 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <config.h> #include <config.h>
#include "tty.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
@ -57,7 +56,9 @@
# include <pwd.h> # include <pwd.h>
#endif #endif
#include "tty.h"
#include "global.h" #include "global.h"
#include "x.h"
#include "win.h" #include "win.h"
#include "color.h" #include "color.h"
#include "dlg.h" #include "dlg.h"

View File

@ -19,7 +19,6 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <config.h> #include <config.h>
#include "tty.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#ifdef NEEDS_IO_H #ifdef NEEDS_IO_H
@ -29,6 +28,8 @@
#include <sys/param.h> #include <sys/param.h>
#include <fcntl.h> #include <fcntl.h>
#include <ctype.h> #include <ctype.h>
#include "tty.h"
#include "x.h"
#include "global.h" #include "global.h"
#include "win.h" #include "win.h"
#include "color.h" #include "color.h"

View File

@ -6,10 +6,7 @@
#undef ENABLE_NLS #undef ENABLE_NLS
#endif #endif
#ifdef HAVE_GNOME #ifndef HAVE_GNOME
# define GNOME_REGEX_H
# include <gnome.h>
#else
# ifdef ENABLE_NLS # ifdef ENABLE_NLS
# include <libintl.h> # include <libintl.h>
# define _(String) gettext (String) # define _(String) gettext (String)
@ -28,6 +25,6 @@
# define _(String) (String) # define _(String) (String)
# define N_(String) (String) # define N_(String) (String)
# endif # endif
#endif #endif /* !HAVE_GNOME */
#endif /* _MC_I18N_H_ */ #endif /* _MC_I18N_H_ */

View File

@ -37,6 +37,7 @@
# include <pwd.h> # include <pwd.h>
#endif #endif
#include "tty.h" #include "tty.h"
#include "x.h"
#include "global.h" #include "global.h"
#include "win.h" #include "win.h"
#include "color.h" #include "color.h"

View File

@ -43,6 +43,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "global.h" #include "global.h"
#include "x.h"
#include "treestore.h" #include "treestore.h"
#include "../vfs/vfs.h" #include "../vfs/vfs.h"
#ifdef NEEDS_IO_H #ifdef NEEDS_IO_H

View File

@ -26,6 +26,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include "global.h" #include "global.h"
#include "x.h"
#include "dialog.h" #include "dialog.h"
#include "color.h" #include "color.h"
#include "dir.h" #include "dir.h"

View File

@ -6,9 +6,9 @@
#define MIDNIGHT #define MIDNIGHT
#include "../gtkedit/edit-widget.h" #include "../gtkedit/edit-widget.h"
#undef MIDNIGHT #undef MIDNIGHT
void user_menu_cmd (WEdit *edit_widget);
#endif #endif
void user_menu_cmd (WEdit *edit_widget);
char *expand_format (char, int); char *expand_format (char, int);
int check_format_view (const char *); int check_format_view (const char *);
int check_format_var (const char *, char **); int check_format_var (const char *, char **);

View File

@ -72,6 +72,7 @@
#include <regex.h> #include <regex.h>
#endif #endif
#include "global.h" #include "global.h"
#include "x.h"
#include "profile.h" #include "profile.h"
#include "user.h" /* expand_format */ #include "user.h" /* expand_format */
#include "main.h" /* mc_home */ #include "main.h" /* mc_home */