* file.c (panel_get_file): Make static.

* filegui.h: Eliminate use of WANT_WIDGETS.
* setup.h: Likewise.
* menu.h: Declare struct WMenu.
* main.h: Don't include menu.h, use forward declaration.

src/ChangeLog

@@ -1,5 +1,11 @@
 2002-11-11  Pavel Roskin  <proski@gnu.org>
 
+	* file.c (panel_get_file): Make static.
+	* filegui.h: Eliminate use of WANT_WIDGETS.
+	* setup.h: Likewise.
+	* menu.h: Declare struct WMenu.
+	* main.h: Don't include menu.h, use forward declaration.
+
 	* dlg.h: Move movefn definition ...
 	* win.h: ... where it's used.  Remove unused definitions.
 	* win.c: Remove unused code.

src/file.c

@@ -1554,7 +1554,7 @@ erase_dir_iff_empty (FileOpContext *ctx, char *s)
 /* {{{ Panel operate routines */
 
 /* Returns currently selected file or the first marked file if there is one */
-char *
+static char *
 panel_get_file (WPanel *panel, struct stat *stat_buf)
 {
     int i;

src/filegui.h

@@ -1,14 +1,6 @@
 #ifndef __FILEGUI_H
 #define __FILEGUI_H
 
-/*
- * GUI callback routines
- */
-
 void fmd_init_i18n (int force);
 
-#ifdef WANT_WIDGETS
-char *panel_get_file (WPanel *panel, struct stat *stat_buf);
-#endif
-
 #endif

src/main.c

@@ -109,7 +109,7 @@ WPanel *right_panel;
 WTree *the_tree;
 
 /* The Menubar */
-WMenu *the_menubar;
+struct WMenu *the_menubar;
 
 /* Pointers to the selected and unselected panel */
 WPanel *current_panel = NULL;

src/main.h

@@ -158,8 +158,9 @@ extern WLabel     *the_hint;
 extern Dlg_head   *midnight_dlg;
 extern Dlg_head   *edit_dlg;
 extern WLabel     *process_status;
-#include "menu.h"
+
-extern WMenu      *the_menubar;
+struct WMenu;
+extern struct WMenu *the_menubar;
 #endif /* WANT_WIDGETS */
 
 void edition_pre_exec (void);

src/menu.h

@@ -31,7 +31,7 @@ typedef sMenu *Menu;
 extern int menubar_visible;
 
 /* The button bar menu */
-typedef struct {
+typedef struct WMenu {
     Widget widget;
 
     int    active;		/* If the menubar is in use */

src/panel.h

@@ -33,7 +33,7 @@ enum panel_display_enum {
 struct format_e;
 struct hist_entry;
 
-typedef struct {
+typedef struct WPanel {
     Widget   widget;
     dir_list dir;		/* Directory contents */
 

src/setup.c

@@ -216,7 +216,7 @@ static const struct {
 };
 
 void
-panel_save_setup (WPanel *panel, char *section)
+panel_save_setup (struct WPanel *panel, char *section)
 {
     char buffer [BUF_TINY];
     int  i;
@@ -299,7 +299,7 @@ panel_save_type (char *section, int type)
 }
 
 void
-save_panel_types ()
+save_panel_types (void)
 {
     int type;
 

src/setup.h

@@ -7,17 +7,14 @@ void save_configure (void);
 void load_setup (void);
 void save_setup (void);
 void done_setup (void);
-#ifdef WANT_WIDGETS
-void panel_save_setup (WPanel *panel, char *section);
-void panel_load_setup (WPanel *panel, char *section);
-#else
-void panel_save_setup ();
-void panel_load_setup ();
-#endif
 void load_key_defs (void);
 void save_panel_types (void);
 char *load_anon_passwd (void);
 
+struct WPanel;
+void panel_save_setup (struct WPanel *panel, char *section);
+void panel_load_setup (struct WPanel *panel, char *section);
+
 extern char *profile_name;
 extern char *global_profile_name;