From 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 19 Feb 2008 21:42:32 +0000 Subject: merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. QAR-290 = QAR-271 + QAR-191 --- indra/llui/llscrollingpanellist.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'indra/llui/llscrollingpanellist.h') diff --git a/indra/llui/llscrollingpanellist.h b/indra/llui/llscrollingpanellist.h index f697a99a06..cb832f4bec 100644 --- a/indra/llui/llscrollingpanellist.h +++ b/indra/llui/llscrollingpanellist.h @@ -35,30 +35,31 @@ #include "llview.h" #include "llpanel.h" -// virtual class for scrolling panels +/* + * Pure virtual class represents a scrolling panel. + */ class LLScrollingPanel : public LLPanel { public: - LLScrollingPanel(const LLString& name, const LLRect& rect) - : LLPanel(name, rect) - { - } + LLScrollingPanel(const LLString& name, const LLRect& rect) : LLPanel(name, rect) { } virtual void updatePanel(BOOL allow_modify) = 0; - }; - -// A set of panels that are displayed in a vertical sequence inside a scroll container. + + +/* + * A set of panels that are displayed in a vertical sequence inside a scroll container. + */ class LLScrollingPanelList : public LLUICtrl { public: LLScrollingPanelList(const LLString& name, const LLRect& rect) : LLUICtrl(name, rect, TRUE, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_BOTTOM ) {} - virtual void setValue(const LLSD& value); - virtual EWidgetType getWidgetType() const; - virtual LLString getWidgetTag() const; + virtual void setValue(const LLSD& value) {}; + virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SCROLLING_PANEL_LIST; } + virtual LLString getWidgetTag() const { return LL_SCROLLING_PANEL_LIST_TAG; } - virtual LLXMLNodePtr getXML(bool save_children) const; + virtual LLXMLNodePtr getXML(bool save_children) const { return LLUICtrl::getXML(); } virtual void draw(); @@ -68,9 +69,8 @@ public: static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); -protected: +private: void updatePanelVisiblilty(); -protected: std::deque mPanelList; }; -- cgit v1.2.3