From 5c32819c39e98c90876bf0540cbde4206cf777ce Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sat, 17 Nov 2012 06:14:09 +0000
Subject: [PATCH] Move common/ui/popup.c -> common/ui/popup.cpp

---
 SConstruct                       | 2 +-
 common/ui/{popup.c => popup.cpp} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename common/ui/{popup.c => popup.cpp} (95%)

diff --git a/SConstruct b/SConstruct
index 0b6fce47e..2dfc41ebc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -645,7 +645,7 @@ class DXXArchive(DXXCommon):
 'ui/menu.cpp',
 'ui/menubar.cpp',
 'ui/message.cpp',
-'ui/popup.c',
+'ui/popup.cpp',
 'ui/radio.c',
 'ui/scroll.c',
 'ui/ui.c',
diff --git a/common/ui/popup.c b/common/ui/popup.cpp
similarity index 95%
rename from common/ui/popup.c
rename to common/ui/popup.cpp
index 39c1e40f1..2ecad97b9 100644
--- a/common/ui/popup.c
+++ b/common/ui/popup.cpp
@@ -136,7 +136,7 @@ int PopupMenu( int NumButtons, char * text[] )
 		//Mouse.y = y + (MENU_BORDER+3) + button_height/2;
 	}
 
-	dlg = ui_create_dialog( x, y, width, height, DF_DIALOG | DF_MODAL, (int (*)(UI_DIALOG *, d_event *, void *))popup_handler, p );
+	dlg = ui_create_dialog( x, y, width, height, static_cast<dialog_flags>(DF_DIALOG | DF_MODAL), (int (*)(UI_DIALOG *, d_event *, void *))popup_handler, p );
 
 	//mouse_set_pos(Mouse.x, Mouse.y);