TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move common/ui/menu.c -> common/ui/menu.cpp

Browse source
This commit is contained in:
Kp 2012-11-17 06:14:09 +00:00
parent a9652f1b9b
commit fca8ac2012
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -642,7 +642,7 @@ class DXXArchive(DXXCommon):
'ui/keypress.cpp', 'ui/keypress.cpp',
'ui/keytrap.cpp', 'ui/keytrap.cpp',
'ui/listbox.cpp', 'ui/listbox.cpp',
'ui/menu.c', 'ui/menu.cpp',
'ui/menubar.c', 'ui/menubar.c',
'ui/message.c', 'ui/message.c',
'ui/popup.c', 'ui/popup.c',

4
common/ui/menu.c → common/ui/menu.cpp
View file

@ -34,7 +34,7 @@ typedef struct menu
int num_buttons; int num_buttons;
} menu; } menu;
static int menu_handler(UI_DIALOG *dlg, d_event *event, menu *m) static int menu_handler(UI_DIALOG *, d_event *event, menu *m)
{ {
int i; int i;
@ -115,7 +115,7 @@ int MenuX( int x, int y, int NumButtons, char * text[] )
y = h - height; y = h - height;
} }
dlg = ui_create_dialog( x, y, width, height, DF_FILLED | DF_SAVE_BG | DF_MODAL, (int (*)(UI_DIALOG *, d_event *, void *))menu_handler, m ); dlg = ui_create_dialog( x, y, width, height, static_cast<dialog_flags>(DF_FILLED | DF_SAVE_BG | DF_MODAL), (int (*)(UI_DIALOG *, d_event *, void *))menu_handler, m );
x = MENU_BORDER+3; x = MENU_BORDER+3;
y = MENU_BORDER+3; y = MENU_BORDER+3;