* main.c, main.h, main-widgets.h, filegui.c, layout.c, screen.c:

moved main widget declarations into main-widgets.h and
  removed the WANT_WIDGETS symbol
This commit is contained in:
Enrico Weigelt, metux IT service 2009-01-10 21:30:12 +01:00
parent ff9ff2058d
commit 53627743b4
6 changed files with 24 additions and 12 deletions

View File

@ -1,3 +1,10 @@
2009-01-09 Enrico Weigelt, metux ITS <weigelt@metux.de>
* main.c, main.h, main-widgets.h, filegui.c, layout.c, screen.c:
moved main widget declarations into main-widgets.h and
removed the WANT_WIDGETS symbol
2009-01-05 Slava Zanko 2009-01-05 Slava Zanko
* main.c (main): remove compatibility_move_mc_files stuff. * main.c (main): remove compatibility_move_mc_files stuff.

View File

@ -58,7 +58,7 @@
#include "dialog.h" /* do_refresh() */ #include "dialog.h" /* do_refresh() */
#include "color.h" /* dialog_colors */ #include "color.h" /* dialog_colors */
#include "widget.h" /* WLabel */ #include "widget.h" /* WLabel */
#define WANT_WIDGETS #include "main-widgets.h"
#include "main.h" /* the_hint */ #include "main.h" /* the_hint */
#include "wtools.h" /* QuickDialog */ #include "wtools.h" /* QuickDialog */
#include "panel.h" /* current_panel */ #include "panel.h" /* current_panel */

View File

@ -51,7 +51,7 @@
#include "command.h" #include "command.h"
#include "profile.h" /* For sync_profiles() */ #include "profile.h" /* For sync_profiles() */
#include "mouse.h" #include "mouse.h"
#define WANT_WIDGETS #include "main-widgets.h"
#include "main.h" #include "main.h"
#include "subshell.h" /* For use_subshell and resize_subshell() */ #include "subshell.h" /* For use_subshell and resize_subshell() */
#include "tree.h" #include "tree.h"

14
src/main-widgets.h Normal file
View File

@ -0,0 +1,14 @@
#ifndef MC_MAIN_WIDGETS_H
#define MC_MAIN_WIDGETS_H
#include "widget.h"
#include "dialog.h"
extern WButtonBar *the_bar;
extern WLabel *the_prompt;
extern WLabel *the_hint;
extern Dlg_head *midnight_dlg;
extern struct WMenu *the_menubar;
#endif

View File

@ -116,15 +116,6 @@ char *get_mc_lib_dir (void);
int maybe_cd (int move_up_dir); int maybe_cd (int move_up_dir);
void do_possible_cd (const char *dir); void do_possible_cd (const char *dir);
#ifdef WANT_WIDGETS
extern WButtonBar *the_bar;
extern WLabel *the_prompt;
extern WLabel *the_hint;
extern Dlg_head *midnight_dlg;
extern struct WMenu *the_menubar;
#endif /* WANT_WIDGETS */
void done_menu (void); void done_menu (void);
void init_menu (void); void init_menu (void);

View File

@ -47,7 +47,7 @@
#include "execute.h" #include "execute.h"
#include "widget.h" #include "widget.h"
#include "menu.h" /* menubar_visible */ #include "menu.h" /* menubar_visible */
#define WANT_WIDGETS #include "main-widgets.h"
#include "main.h" /* the_menubar */ #include "main.h" /* the_menubar */
#include "unixcompat.h" #include "unixcompat.h"