From cd17687f01420952712a500107e0f93e7ab8d5f8 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:34 -0500
Subject: Second Life viewer sources 1.19.1.0

---
 linden/indra/llui/llcombobox.h | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'linden/indra/llui/llcombobox.h')

diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index db1c251..f9ca4d2 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -159,10 +159,10 @@ public:
 	virtual BOOL	selectItemRange( S32 first, S32 last );
 	virtual S32		getFirstSelectedIndex() const		{ return getCurrentIndex(); }
 	virtual BOOL	setCurrentByID( const LLUUID& id );
-	virtual LLUUID	getCurrentID();				// LLUUID::null if no items in menu
-	virtual BOOL	setSelectedByValue(LLSD value, BOOL selected);
+	virtual LLUUID	getCurrentID() const;				// LLUUID::null if no items in menu
+	virtual BOOL	setSelectedByValue(const LLSD& value, BOOL selected);
 	virtual LLSD	getSelectedValue();
-	virtual BOOL	isSelected(LLSD value);
+	virtual BOOL	isSelected(const LLSD& value) const;
 	virtual BOOL	operateOnSelection(EOperation op);
 	virtual BOOL	operateOnAll(EOperation op);
 
@@ -183,18 +183,20 @@ public:
 	void			updateSelection();
 	virtual void	showList();
 	virtual void	hideList();
-	
+
 protected:
 	LLButton*			mButton;
 	LLScrollListCtrl*	mList;
-	S32					mButtonPadding;
 	LLViewBorder*		mBorder;
+	EPreferredPosition	mListPosition;
+	LLPointer<LLImageGL> mArrowImage;
+
+private:
+	S32					mButtonPadding;
 	LLLineEditor*		mTextEntry;
-	LLPointer<LLImageGL>	mArrowImage;
 	BOOL				mAllowTextEntry;
 	S32					mMaxChars;
 	BOOL				mTextEntryTentative;
-	EPreferredPosition	mListPosition;
 	void				(*mPrearrangeCallback)(LLUICtrl*,void*);
 	void				(*mTextEntryCallback)(LLLineEditor*, void*);
 };
-- 
cgit v1.1