Skip to content
Snippets Groups Projects
Commit 29e8215f authored by Rider Linden's avatar Rider Linden
Browse files

Merged in andreykproductengine/maint-eep (pull request #252)

SL-1531 Mac build fix
parents fc5f897a 7469fdba
No related branches found
No related tags found
No related merge requests found
...@@ -92,8 +92,8 @@ class LLMultiSlider : public LLF32UICtrl ...@@ -92,8 +92,8 @@ class LLMultiSlider : public LLF32UICtrl
void resetCurSlider(); void resetCurSlider();
void setCurSliderValue(F32 val, BOOL from_event = false) { setSliderValue(mCurSlider, val, from_event); } void setCurSliderValue(F32 val, BOOL from_event = false) { setSliderValue(mCurSlider, val, from_event); }
/*virtual*/ void setValue(const LLSD& value); /*virtual*/ void setValue(const LLSD& value) override;
/*virtual*/ LLSD getValue() const { return mValue; } /*virtual*/ LLSD getValue() const override { return mValue; }
boost::signals2::connection setMouseDownCallback( const commit_signal_t::slot_type& cb ); boost::signals2::connection setMouseDownCallback( const commit_signal_t::slot_type& cb );
boost::signals2::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ); boost::signals2::connection setMouseUpCallback( const commit_signal_t::slot_type& cb );
...@@ -104,14 +104,14 @@ class LLMultiSlider : public LLF32UICtrl ...@@ -104,14 +104,14 @@ class LLMultiSlider : public LLF32UICtrl
bool addSlider(F32 val, const std::string& name); bool addSlider(F32 val, const std::string& name);
void deleteSlider(const std::string& name); void deleteSlider(const std::string& name);
void deleteCurSlider() { deleteSlider(mCurSlider); } void deleteCurSlider() { deleteSlider(mCurSlider); }
void clear(); /*virtual*/ void clear() override;
/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask) override;
/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask); /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask) override;
/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask) override; /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask) override;
/*virtual*/ void draw(); /*virtual*/ void draw() override;
S32 getMaxNumSliders() { return mMaxNumSliders; } S32 getMaxNumSliders() { return mMaxNumSliders; }
S32 getCurNumSliders() { return mValue.size(); } S32 getCurNumSliders() { return mValue.size(); }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment