From fca8ac201204ff978eb187da42cea2fd15726f79 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 17 Nov 2012 06:14:09 +0000 Subject: [PATCH] Move common/ui/menu.c -> common/ui/menu.cpp --- SConstruct | 2 +- common/ui/{menu.c => menu.cpp} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename common/ui/{menu.c => menu.cpp} (92%) diff --git a/SConstruct b/SConstruct index c8f86450e..98969159a 100644 --- a/SConstruct +++ b/SConstruct @@ -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', diff --git a/common/ui/menu.c b/common/ui/menu.cpp similarity index 92% rename from common/ui/menu.c rename to common/ui/menu.cpp index cccd81ff2..9f2305532 100644 --- a/common/ui/menu.c +++ b/common/ui/menu.cpp @@ -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(DF_FILLED | DF_SAVE_BG | DF_MODAL), (int (*)(UI_DIALOG *, d_event *, void *))menu_handler, m ); x = MENU_BORDER+3; y = MENU_BORDER+3;