diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-02-05 20:20:42 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-02-05 20:20:42 +0000 |
| commit | d1582a5105f01181535fb859c530e45c2efca071 (patch) | |
| tree | f8c6939e2c67d64d7be0e2488af296b42f13800d /indra/llui/llmenugl.h | |
| parent | 57be416ab7c9d93196231fb55de8ba563f3b29eb (diff) | |
merge -r 57111:57464 maintenance.
Diffstat (limited to 'indra/llui/llmenugl.h')
| -rw-r--r-- | indra/llui/llmenugl.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index b9f7d033ac..d43b4553c3 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -22,6 +22,7 @@ #include "llview.h" class LLMenuItemGL; +class LLMenuHolderGL; extern S32 MENU_BAR_HEIGHT; extern S32 MENU_BAR_WIDTH; @@ -144,6 +145,7 @@ public: // LLView Functionality virtual BOOL handleKeyHere( KEY key, MASK mask, BOOL called_from_parent ); + virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask ); virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask ); virtual void draw( void ); @@ -504,7 +506,8 @@ public: static BOOL getKeyboardMode() { return sKeyboardMode; } static void onFocusLost(LLView* old_focus); - static LLView *sDefaultMenuContainer; + + static LLMenuHolderGL* sMenuContainer; protected: void createSpilloverBranch(); @@ -679,8 +682,10 @@ public: virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask ); virtual BOOL handleRightMouseDown( S32 x, S32 y, MASK mask ); + virtual const LLRect getMenuRect() const; + virtual BOOL hasVisibleMenu() const; + static void setActivatedItem(LLMenuItemGL* item); - BOOL hasVisibleMenu(); protected: static LLViewHandle sItemLastSelectedHandle; |