Move common/ui/menu.c -> common/ui/menu.cpp
This commit is contained in:
parent
a9652f1b9b
commit
fca8ac2012
|
@ -642,7 +642,7 @@ class DXXArchive(DXXCommon):
|
|||
'ui/keypress.cpp',
|
||||
'ui/keytrap.cpp',
|
||||
'ui/listbox.cpp',
|
||||
'ui/menu.c',
|
||||
'ui/menu.cpp',
|
||||
'ui/menubar.c',
|
||||
'ui/message.c',
|
||||
'ui/popup.c',
|
||||
|
|
|
@ -34,7 +34,7 @@ typedef struct menu
|
|||
int num_buttons;
|
||||
} 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;
|
||||
|
||||
|
@ -115,7 +115,7 @@ int MenuX( int x, int y, int NumButtons, char * text[] )
|
|||
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;
|
||||
y = MENU_BORDER+3;
|
Loading…
Reference in a new issue