diff -r bca151238f5e -r d7ba44e7a714 extensions/topmenus/TopMenu.cpp --- a/extensions/topmenus/TopMenu.cpp Tue Oct 02 14:48:44 2007 +0000 +++ b/extensions/topmenus/TopMenu.cpp Tue Oct 02 15:13:13 2007 +0000 @@ -462,6 +462,12 @@ obj = *pObject; + style = obj->callbacks->OnTopMenuDrawOption(this, client, obj->object_id); + if (style != ITEMDRAW_DEFAULT) + { + return; + } + if (obj->cmdname[0] == '\0') { return; @@ -496,7 +502,7 @@ /* Ask the object to render the text for this client */ char renderbuf[64]; - obj->callbacks->OnTopMenuDrawOption(this, client, obj->object_id, renderbuf, sizeof(renderbuf)); + obj->callbacks->OnTopMenuDisplayOption(this, client, obj->object_id, renderbuf, sizeof(renderbuf)); /* Build the new draw info */ ItemDrawInfo new_dr = dr; @@ -584,7 +590,7 @@ { obj_by_name_t *temp_obj = &item_list[i]; topmenu_object_t *obj = m_Categories[m_UnsortedCats[i]]->obj; - obj->callbacks->OnTopMenuDrawOption(this, + obj->callbacks->OnTopMenuDisplayOption(this, client, obj->object_id, temp_obj->name, @@ -610,7 +616,7 @@ /* Set the menu's title */ char renderbuf[128]; - m_pTitle->OnTopMenuDrawTitle(this, client, 0, renderbuf, sizeof(renderbuf)); + m_pTitle->OnTopMenuDisplayTitle(this, client, 0, renderbuf, sizeof(renderbuf)); root_menu->SetDefaultTitle(renderbuf); /* The client is now fully updated */ @@ -676,7 +682,7 @@ { obj_by_name_t *item = &item_list[i]; topmenu_object_t *obj = cat->unsorted[i]; - obj->callbacks->OnTopMenuDrawOption(this, + obj->callbacks->OnTopMenuDisplayOption(this, client, obj->object_id, item->name, @@ -698,7 +704,7 @@ /* Set the menu's title */ char renderbuf[128]; - cat->obj->callbacks->OnTopMenuDrawTitle(this, + cat->obj->callbacks->OnTopMenuDisplayTitle(this, client, cat->obj->object_id, renderbuf,