diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/llui/llradiogroup.cpp | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
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
Diffstat (limited to 'indra/llui/llradiogroup.cpp')
| -rw-r--r-- | indra/llui/llradiogroup.cpp | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/indra/llui/llradiogroup.cpp b/indra/llui/llradiogroup.cpp index 6fba415d35..8bda6780a2 100644 --- a/indra/llui/llradiogroup.cpp +++ b/indra/llui/llradiogroup.cpp @@ -29,9 +29,6 @@ * $/LicenseInfo$ */ -// An invisible view containing multiple mutually exclusive toggling -// buttons (usually radio buttons). Automatically handles the mutex -// condition by highlighting only one button at a time. #include "linden_common.h" @@ -45,6 +42,7 @@ #include "llui.h" #include "llfocusmgr.h" + LLRadioGroup::LLRadioGroup(const LLString& name, const LLRect& rect, const LLString& control_name, LLUICtrlCallback callback, @@ -73,7 +71,7 @@ void LLRadioGroup::init(BOOL border) if (border) { addChild( new LLViewBorder( "radio group border", - LLRect(0, mRect.getHeight(), mRect.getWidth(), 0), + LLRect(0, getRect().getHeight(), getRect().getWidth(), 0), LLViewBorder::BEVEL_NONE, LLViewBorder::STYLE_LINE, 1 ) ); @@ -146,11 +144,6 @@ void LLRadioGroup::setIndexEnabled(S32 index, BOOL enabled) } } -S32 LLRadioGroup::getSelectedIndex() const -{ - return mSelectedIndex; -} - BOOL LLRadioGroup::setSelectedIndex(S32 index, BOOL from_event) { if (index < 0 || index >= (S32)mRadioButtons.size()) @@ -452,12 +445,12 @@ BOOL LLRadioGroup::setCurrentByID( const LLUUID& id ) return FALSE; } -LLUUID LLRadioGroup::getCurrentID() +LLUUID LLRadioGroup::getCurrentID() const { return LLUUID::null; } -BOOL LLRadioGroup::setSelectedByValue(LLSD value, BOOL selected) +BOOL LLRadioGroup::setSelectedByValue(const LLSD& value, BOOL selected) { S32 idx = 0; std::string value_string = value.asString(); @@ -480,7 +473,7 @@ LLSD LLRadioGroup::getSelectedValue() return getValue(); } -BOOL LLRadioGroup::isSelected(LLSD value) +BOOL LLRadioGroup::isSelected(const LLSD& value) const { S32 idx = 0; std::string value_string = value.asString(); @@ -510,13 +503,6 @@ BOOL LLRadioGroup::operateOnAll(EOperation op) } -LLRadioCtrl::LLRadioCtrl(const LLString& name, const LLRect& rect, const LLString& label, - const LLFontGL* font, void (*commit_callback)(LLUICtrl*, void*), void* callback_userdata) : - LLCheckBoxCtrl(name, rect, label, font, commit_callback, callback_userdata, FALSE, RADIO_STYLE) -{ - setTabStop(FALSE); -} - LLRadioCtrl::~LLRadioCtrl() { } |