merge from viewer-trunk

1 files changed, 22 insertions, 49 deletions

diff --git a/indra/llui/llaccordionctrltab.h b/indra/llui/llaccordionctrltab.h
index 8ae91ad651..4b8b22405e 100644
--- a/indra/llui/llaccordionctrltab.h
+++ b/indra/llui/llaccordionctrltab.h
@@ -2,25 +2,31 @@
  * @file LLAccordionCtrlTab.h
  * @brief Collapsible box control implementation
  *
- * $LicenseInfo:firstyear=2004&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
  * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
  * $/LicenseInfo$
  */
 
@@ -31,7 +37,6 @@
 #include "llrect.h"
 #include "lluictrl.h"
 #include "lluicolor.h"
-#include "llstyle.h"
 
 class LLUICtrlFactory;
 class LLUIImage;
@@ -83,8 +88,6 @@ public:
 
 		Optional<bool>			fit_panel;
 
-		Optional<bool>			selection_enabled;
-
 		Optional<S32>			padding_left;
 		Optional<S32>			padding_right;
 		Optional<S32>			padding_top;
@@ -110,22 +113,6 @@ public:
 	void		setAccordionView(LLView* panel);
 	LLView*		getAccordionView() { return mContainerPanel; };
 
-	std::string getTitle() const;
-
-	// Set text and highlight substring in LLAccordionCtrlTabHeader
-	void setTitle(const std::string& title, const std::string& hl = LLStringUtil::null);
-
-	// Set text font style in LLAccordionCtrlTabHeader
-	void setTitleFontStyle(std::string style);
-
-	// Set text color in LLAccordionCtrlTabHeader
-	void setTitleColor(LLUIColor color);
-
-	boost::signals2::connection setFocusReceivedCallback(const focus_signal_t::slot_type& cb);
-	boost::signals2::connection setFocusLostCallback(const focus_signal_t::slot_type& cb);
-
-	void setSelected(bool is_selected);
-
 	bool getCollapsible() {return mCollapsible;};
 
 	void setCollapsible(bool collapsible) {mCollapsible = collapsible;};
@@ -155,24 +142,15 @@ public:
 	// Call reshape after changing size
 	virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
-	/**
-	 * Raises notifyParent event with "child_visibility_change" = new_visibility
-	 */
-	void handleVisibilityChange(BOOL new_visibility);
-
 	// Changes expand/collapse state and triggers expand/collapse callbacks
 	virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
 
 	virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
 
-	virtual BOOL handleToolTip(S32 x, S32 y, MASK mask);
-	virtual BOOL handleScrollWheel( S32 x, S32 y, S32 clicks );
-
-
 	virtual bool addChild(LLView* child, S32 tab_group);
 
-	bool isExpanded() const { return mDisplayChildren; }
+	bool isExpanded() { return mDisplayChildren; }
 
 	S32 getHeaderHeight();
 
@@ -193,7 +171,6 @@ public:
 	void showAndFocusHeader();
 
 	void setFitPanel( bool fit ) { mFitPanel = true; }
-	bool getFitParent() const { return mFitPanel; }
 
 protected:
 	void adjustContainerPanel	(const LLRect& child_rect);
@@ -212,10 +189,6 @@ protected:
 	void drawChild(const LLRect& root_rect,LLView* child);
 
 	LLView* findContainerView	();
-
-	void selectOnFocusReceived();
-	void deselectOnFocusLost();
-
 private:
 
 	class LLAccordionCtrlTabHeader;