diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-24 00:08:35 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-24 00:08:35 +0300 |
| commit | b8127f80c7e305b0c5af7a824b45c81432a8e6b8 (patch) | |
| tree | ed34b16459488ce3e6293f84447f04c31ce4887a /indra/llui/llmenugl.h | |
| parent | aabb0bbc49aa15b100dc8c2cbf286202cb084646 (diff) | |
| parent | 05f3287512557cd4cb41de7a8fe3f5171a48481d (diff) | |
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
# indra/llcommon/llkeybind.cpp
# indra/llcommon/llkeybind.h
Diffstat (limited to 'indra/llui/llmenugl.h')
| -rw-r--r-- | indra/llui/llmenugl.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 8cef9c6463..1f11f26192 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -42,13 +42,6 @@ extern S32 MENU_BAR_HEIGHT; extern S32 MENU_BAR_WIDTH; -class LLMenuKeyboardBinding -{ -public: - KEY mKey; - MASK mMask; -}; - //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Class LLMenuItemGL // @@ -98,7 +91,6 @@ public: /*virtual*/ void setValue(const LLSD& value); /*virtual*/ LLSD getValue() const; - virtual bool hasAccelerator(const KEY &key, const MASK &mask) const; virtual BOOL handleAcceleratorKey(KEY key, MASK mask); LLColor4 getHighlightBgColor() { return mHighlightBackground.get(); } @@ -117,7 +109,7 @@ public: virtual void setBriefItem(BOOL brief); virtual BOOL isBriefItem() const; - virtual BOOL addToAcceleratorList(std::list<LLMenuKeyboardBinding*> *listp); + virtual BOOL addToAcceleratorList(std::list<LLKeyBinding*> *listp); void setAllowKeyRepeat(BOOL allow) { mAllowKeyRepeat = allow; } BOOL getAllowKeyRepeat() const { return mAllowKeyRepeat; } @@ -444,8 +436,7 @@ public: /*virtual*/ bool addChild(LLView* view, S32 tab_group = 0); /*virtual*/ void removeChild( LLView* ctrl); /*virtual*/ BOOL postBuild(); - - virtual bool hasAccelerator(const KEY &key, const MASK &mask) const; + virtual BOOL handleAcceleratorKey(KEY key, MASK mask); LLMenuGL* findChildMenuByName(const std::string& name, BOOL recurse) const; @@ -637,11 +628,10 @@ public: virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); - virtual bool hasAccelerator(const KEY &key, const MASK &mask) const; virtual BOOL handleAcceleratorKey(KEY key, MASK mask); // check if we've used these accelerators already - virtual BOOL addToAcceleratorList(std::list <LLMenuKeyboardBinding*> *listp); + virtual BOOL addToAcceleratorList(std::list <LLKeyBinding*> *listp); // called to rebuild the draw label virtual void buildDrawLabel( void ); @@ -807,7 +797,7 @@ private: void checkMenuTrigger(); - std::list <LLMenuKeyboardBinding*> mAccelerators; + std::list <LLKeyBinding*> mAccelerators; BOOL mAltKeyTrigger; }; |