Ticket #155: want-widgets.001.diff

File want-widgets.001.diff, 2.4 KB (added by anonymous, 15 years ago)

Added by email2trac

  • src/ChangeLog 

    diff --git a/src/ChangeLog b/src/ChangeLog
index 5653ea6..d17dd69 100644
    a b  
     1 
     22009-01-09 Enrico Weigelt, metux ITS <weigelt@metux.de> 
     3 
     4        * main.c, main.h, main-widgets.h, filegui.c, layout.c, screen.c: 
     5          moved main widget declarations into main-widgets.h and 
     6          removed the WANT_WIDGETS symbol 
     7 
    182009-01-05  Slava Zanko    
    29        * main.c (main): remove compatibility_move_mc_files stuff. 
    310 

  • src/filegui.c 

    diff --git a/src/filegui.c b/src/filegui.c
index 441adb7..a526d2d 100644
    a b  
    5858#include "dialog.h"             /* do_refresh() */ 
    5959#include "color.h"              /* dialog_colors */ 
    6060#include "widget.h"             /* WLabel */ 
    61 #define WANT_WIDGETS 
     61#include "main-widgets.h" 
    6262#include "main.h"               /* the_hint */ 
    6363#include "wtools.h"             /* QuickDialog */ 
    6464#include "panel.h"              /* current_panel */ 

  • src/layout.c 

    diff --git a/src/layout.c b/src/layout.c
index 9f3616f..8bd8e7e 100644
    a b  
    5151#include "command.h" 
    5252#include "profile.h"            /* For sync_profiles() */ 
    5353#include "mouse.h" 
    54 #define WANT_WIDGETS 
     54#include "main-widgets.h" 
    5555#include "main.h" 
    5656#include "subshell.h"   /* For use_subshell and resize_subshell() */ 
    5757#include "tree.h" 

  • new file src/main-widgets.h 

    diff --git a/src/main-widgets.h b/src/main-widgets.h
new file mode 100644
index 0000000..861e183
    - +  
     1#ifndef MC_MAIN_WIDGETS_H 
     2#define MC_MAIN_WIDGETS_H 
     3 
     4#include "widget.h" 
     5#include "dialog.h" 
     6 
     7extern WButtonBar *the_bar; 
     8extern WLabel     *the_prompt; 
     9extern WLabel     *the_hint; 
     10extern Dlg_head   *midnight_dlg; 
     11 
     12extern struct WMenu *the_menubar; 
     13 
     14#endif 

  • src/main.h 

    diff --git a/src/main.h b/src/main.h
index 3f3c695..fb38e7a 100644
    a b char *get_mc_lib_dir (void); 
    116116int maybe_cd (int move_up_dir); 
    117117void do_possible_cd (const char *dir); 
    118118 
    119 #ifdef WANT_WIDGETS 
    120 extern WButtonBar *the_bar; 
    121 extern WLabel     *the_prompt; 
    122 extern WLabel     *the_hint; 
    123 extern Dlg_head   *midnight_dlg; 
    124  
    125 extern struct WMenu *the_menubar; 
    126 #endif /* WANT_WIDGETS */ 
    127  
    128119void done_menu (void); 
    129120void init_menu (void); 
    130121 

  • src/screen.c 

    diff --git a/src/screen.c b/src/screen.c
index 74604f4..f35099e 100644
    a b  
    4747#include "execute.h" 
    4848#include "widget.h" 
    4949#include "menu.h"               /* menubar_visible */ 
    50 #define WANT_WIDGETS 
     50#include "main-widgets.h" 
    5151#include "main.h"               /* the_menubar */ 
    5252#include "unixcompat.h" 
    5353