1.1 --- a/core/MenuManager.cpp	Sun May 13 17:23:42 2007 +0000
     1.2 +++ b/core/MenuManager.cpp	Sun May 13 18:55:59 2007 +0000
     1.3 @@ -44,7 +44,7 @@
     1.4  	m_pHandler->OnMenuCancel(menu, client, reason);
     1.5  }
     1.6  
     1.7 -void BroadcastHandler::OnMenuDisplay(IBaseMenu *menu, int client, IMenuDisplay *display)
     1.8 +void BroadcastHandler::OnMenuDisplay(IBaseMenu *menu, int client, IMenuPanel *display)
     1.9  {
    1.10  	numClients++;
    1.11  	m_pHandler->OnMenuDisplay(menu, client, display);
    1.12 @@ -214,7 +214,7 @@
    1.13  	return NULL;
    1.14  }
    1.15  
    1.16 -inline bool IsSlotItem(IMenuDisplay *display,
    1.17 +inline bool IsSlotItem(IMenuPanel *display,
    1.18  					   unsigned int style)
    1.19  {
    1.20  	if (!display->CanDrawItem(style))
    1.21 @@ -233,7 +233,7 @@
    1.22  	return true;
    1.23  }
    1.24  
    1.25 -IMenuDisplay *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder order)
    1.26 +IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder order)
    1.27  {
    1.28  	IBaseMenu *menu = md.menu;
    1.29  
    1.30 @@ -290,7 +290,7 @@
    1.31  	}
    1.32  
    1.33  	/* Get our Display pointer and initialize some crap */
    1.34 -	IMenuDisplay *display = menu->CreateDisplay();
    1.35 +	IMenuPanel *display = menu->CreatePanel();
    1.36  	IMenuHandler *mh = md.mh;
    1.37  	bool foundExtra = false;
    1.38  	unsigned int extraItem = 0;