diff options
Diffstat (limited to 'indra/llui/llmenugl.h')
| -rw-r--r-- | indra/llui/llmenugl.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 3166290307..77998be880 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -512,8 +512,6 @@ public: static void setKeyboardMode(BOOL mode) { sKeyboardMode = mode; } static BOOL getKeyboardMode() { return sKeyboardMode; } - static void onFocusLost(LLView* old_focus); - static class LLMenuHolderGL* sMenuContainer; protected: @@ -646,12 +644,8 @@ public: virtual BOOL append(LLMenuItemGL* item); virtual BOOL appendSeparator( const LLString &separator_name = "separator" ); - // the enabled callback is meant for the submenu. The api works - // this way because the menu branch item responsible for the pie - // submenu is constructed here. - virtual BOOL appendMenu(LLPieMenu *menu, - enabled_callback enabled_cb = NULL, - void* user_data = NULL ); + BOOL appendPieMenu(LLPieMenu *menu); + virtual void arrange( void ); // Display the menu centered on this point on the screen. @@ -737,7 +731,7 @@ public: virtual ~LLMenuHolderGL() {} virtual BOOL hideMenus(); - void reshape(S32 width, S32 height, BOOL called_from_parent); + void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); void setCanHide(BOOL can_hide) { mCanHide = can_hide; } // LLView functionality |