diff options
Diffstat (limited to 'linden/indra/newview/llcontainerview.h')
-rw-r--r-- | linden/indra/newview/llcontainerview.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/linden/indra/newview/llcontainerview.h b/linden/indra/newview/llcontainerview.h index f47d685..62222b5 100644 --- a/linden/indra/newview/llcontainerview.h +++ b/linden/indra/newview/llcontainerview.h | |||
@@ -36,6 +36,8 @@ | |||
36 | #include "lltextbox.h" | 36 | #include "lltextbox.h" |
37 | #include "llstatbar.h" | 37 | #include "llstatbar.h" |
38 | 38 | ||
39 | class LLScrollableContainerView; | ||
40 | |||
39 | class LLContainerView : public LLView | 41 | class LLContainerView : public LLView |
40 | { | 42 | { |
41 | protected: | 43 | protected: |
@@ -47,9 +49,6 @@ public: | |||
47 | LLContainerView(const std::string& name, const LLRect& rect); | 49 | LLContainerView(const std::string& name, const LLRect& rect); |
48 | ~LLContainerView(); | 50 | ~LLContainerView(); |
49 | 51 | ||
50 | virtual EWidgetType getWidgetType() const; | ||
51 | virtual LLString getWidgetTag() const; | ||
52 | |||
53 | virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); | 52 | virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); |
54 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); | 53 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); |
55 | 54 | ||
@@ -58,7 +57,14 @@ public: | |||
58 | virtual LLRect getRequiredRect(); // Return the height of this object, given the set options. | 57 | virtual LLRect getRequiredRect(); // Return the height of this object, given the set options. |
59 | 58 | ||
60 | void setLabel(const LLString& label); | 59 | void setLabel(const LLString& label); |
60 | void showLabel(BOOL show) { mShowLabel = show; } | ||
61 | void setDisplayChildren(const BOOL displayChildren); | 61 | void setDisplayChildren(const BOOL displayChildren); |
62 | BOOL getDisplayChildren() { return mDisplayChildren; } | 62 | BOOL getDisplayChildren() { return mDisplayChildren; } |
63 | void setScrollContainer(LLScrollableContainerView* scroll) {mScrollContainer = scroll;} | ||
64 | |||
65 | private: | ||
66 | LLScrollableContainerView* mScrollContainer; | ||
67 | void arrange(S32 width, S32 height, BOOL called_from_parent = TRUE); | ||
68 | BOOL mShowLabel; | ||
63 | }; | 69 | }; |
64 | #endif // LL_CONTAINERVIEW_ | 70 | #endif // LL_CONTAINERVIEW_ |