diff -r a04118454f26 -r 52283fe61d42 core/MenuManager.cpp
--- a/core/MenuManager.cpp	Sun May 13 17:23:42 2007 +0000
+++ b/core/MenuManager.cpp	Sun May 13 18:55:59 2007 +0000
@@ -44,7 +44,7 @@
 	m_pHandler->OnMenuCancel(menu, client, reason);
 }
 
-void BroadcastHandler::OnMenuDisplay(IBaseMenu *menu, int client, IMenuDisplay *display)
+void BroadcastHandler::OnMenuDisplay(IBaseMenu *menu, int client, IMenuPanel *display)
 {
 	numClients++;
 	m_pHandler->OnMenuDisplay(menu, client, display);
@@ -214,7 +214,7 @@
 	return NULL;
 }
 
-inline bool IsSlotItem(IMenuDisplay *display,
+inline bool IsSlotItem(IMenuPanel *display,
 					   unsigned int style)
 {
 	if (!display->CanDrawItem(style))
@@ -233,7 +233,7 @@
 	return true;
 }
 
-IMenuDisplay *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder order)
+IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder order)
 {
 	IBaseMenu *menu = md.menu;
 
@@ -290,7 +290,7 @@
 	}
 
 	/* Get our Display pointer and initialize some crap */
-	IMenuDisplay *display = menu->CreateDisplay();
+	IMenuPanel *display = menu->CreatePanel();
 	IMenuHandler *mh = md.mh;
 	bool foundExtra = false;
 	unsigned int extraItem = 0;