From 941cb9f4124c9ccfd5c845bc94639fa46df12c3d Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 1 Apr 2008 17:45:04 +0000
Subject: merge release@83343 skinning-1-merge@83714 -> release QAR-424

---
 indra/newview/llfloaterpreference.cpp | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

(limited to 'indra/newview/llfloaterpreference.cpp')

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 345561f551..1ad58f2706 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -69,7 +69,7 @@
 #include "llagent.h"
 #include "llviewercontrol.h"
 #include "llviewernetwork.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llkeyboard.h"
 #include "llscrollcontainer.h"
@@ -326,36 +326,36 @@ void LLPreferenceCore::refreshEnabledGraphics()
 
 LLFloaterPreference::LLFloaterPreference()
 {
-	gUICtrlFactory->buildFloater(this, "floater_preferences.xml");
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preferences.xml");
 }
 
 BOOL LLFloaterPreference::postBuild()
 {
-	requires("About...", WIDGET_TYPE_BUTTON);
-	requires("OK", WIDGET_TYPE_BUTTON);
-	requires("Cancel", WIDGET_TYPE_BUTTON);
-	requires("Apply", WIDGET_TYPE_BUTTON);
-	requires("pref core", WIDGET_TYPE_TAB_CONTAINER);
+	requires<LLButton>("About...");
+	requires<LLButton>("OK");
+	requires<LLButton>("Cancel");
+	requires<LLButton>("Apply");
+	requires<LLTabContainer>("pref core");
 
 	if (!checkRequirements())
 	{
 		return FALSE;
 	}
 
-	mAboutBtn = LLUICtrlFactory::getButtonByName(this, "About...");
+	mAboutBtn = getChild<LLButton>("About...");
 	mAboutBtn->setClickedCallback(onClickAbout, this);
 	
-	mApplyBtn = LLUICtrlFactory::getButtonByName(this, "Apply");
+	mApplyBtn = getChild<LLButton>("Apply");
 	mApplyBtn->setClickedCallback(onBtnApply, this);
 		
-	mCancelBtn = LLUICtrlFactory::getButtonByName(this, "Cancel");
+	mCancelBtn = getChild<LLButton>("Cancel");
 	mCancelBtn->setClickedCallback(onBtnCancel, this);
 
-	mOKBtn = LLUICtrlFactory::getButtonByName(this, "OK");
+	mOKBtn = getChild<LLButton>("OK");
 	mOKBtn->setClickedCallback(onBtnOK, this);
 			
 	mPreferenceCore = new LLPreferenceCore(
-		LLUICtrlFactory::getTabContainerByName(this, "pref core"),
+		getChild<LLTabContainer>("pref core"),
 		getChild<LLButton>("OK")
 		);
 	
@@ -371,16 +371,6 @@ LLFloaterPreference::~LLFloaterPreference()
 	delete mPreferenceCore;
 }
 
-
-void LLFloaterPreference::draw()
-{
-	if( getVisible() )
-	{
-		LLFloater::draw();
-	}
-}
-
-
 void LLFloaterPreference::apply()
 {
 	this->mPreferenceCore->apply();
-- 
cgit v1.3