diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/llui/llscrollcontainer.h | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llui/llscrollcontainer.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linden/indra/llui/llscrollcontainer.h b/linden/indra/llui/llscrollcontainer.h index 51b1527..b6999e6 100644 --- a/linden/indra/llui/llscrollcontainer.h +++ b/linden/indra/llui/llscrollcontainer.h | |||
@@ -70,8 +70,6 @@ public: | |||
70 | void setScrolledView(LLView* view) { mScrolledView = view; } | 70 | void setScrolledView(LLView* view) { mScrolledView = view; } |
71 | 71 | ||
72 | virtual void setValue(const LLSD& value) { mInnerRect.setValue(value); } | 72 | virtual void setValue(const LLSD& value) { mInnerRect.setValue(value); } |
73 | virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SCROLL_CONTAINER; } | ||
74 | virtual LLString getWidgetTag() const { return LL_SCROLLABLE_CONTAINER_VIEW_TAG; } | ||
75 | 73 | ||
76 | void calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const; | 74 | void calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const; |
77 | void calcVisibleSize( const LLRect& doc_rect, S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const; | 75 | void calcVisibleSize( const LLRect& doc_rect, S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const; |
@@ -90,7 +88,7 @@ public: | |||
90 | 88 | ||
91 | // LLView functionality | 89 | // LLView functionality |
92 | virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); | 90 | virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); |
93 | virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); | 91 | virtual BOOL handleKeyHere(KEY key, MASK mask); |
94 | virtual BOOL handleScrollWheel( S32 x, S32 y, S32 clicks ); | 92 | virtual BOOL handleScrollWheel( S32 x, S32 y, S32 clicks ); |
95 | virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, | 93 | virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, |
96 | EDragAndDropType cargo_type, | 94 | EDragAndDropType cargo_type, |