Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused LLScrollListLineEditor class

Browse Source
This commit is contained in:
Lirusaito
2013-07-10 19:54:13 -04:00
parent 781bb288ab
commit 6d32a39544
2 changed files with 0 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
indra/llui/llscrolllistctrl.cpp
View File

@@ -54,9 +54,6 @@
#include "llcontrol.h" #include "llcontrol.h"
#include "llkeyboard.h" #include "llkeyboard.h"
#include "llresizebar.h" #include "llresizebar.h"
// <edit>
#include "lllineeditor.h"
// </edit>
const S32 MIN_COLUMN_WIDTH = 20; const S32 MIN_COLUMN_WIDTH = 20;
const S32 LIST_SNAP_PADDING = 5; const S32 LIST_SNAP_PADDING = 5;
@@ -211,59 +208,6 @@ void LLScrollListIcon::draw(const LLColor4& color, const LLColor4& highlight_col
} }
} }
// <edit>
//
// LLScrollListLineEditor
//
LLScrollListLineEditor::LLScrollListLineEditor(LLLineEditor* line_editor, S32 width)
{
mLineEditor = line_editor;
LLRect rect(mLineEditor->getRect());
if (width)
{
rect.mRight = rect.mLeft + width;
mLineEditor->setRect(rect);
setWidth(width);
}
else
{
setWidth(rect.getWidth()); //line_editor->getWidth();
}
}
LLScrollListLineEditor::~LLScrollListLineEditor()
{
delete mLineEditor;
}
void LLScrollListLineEditor::draw(const LLColor4& color, const LLColor4& highlight_color) const
{
mLineEditor->draw();
}
BOOL LLScrollListLineEditor::handleClick()
{
if (mLineEditor->getEnabled())
{
mLineEditor->setFocus(TRUE);
mLineEditor->selectAll();
}
// return value changes selection?
return FALSE; //TRUE;
}
BOOL LLScrollListLineEditor::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
{
return TRUE;
}
BOOL LLScrollListLineEditor::handleUnicodeCharHere(llwchar uni_char )
{
return TRUE;
}
// </edit>
// //
// LLScrollListText // LLScrollListText
@@ -3687,21 +3631,6 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
columnp->mHeader->setHasResizableElement(TRUE); columnp->mHeader->setHasResizableElement(TRUE);
} }
} }
// <edit>
else if(type == "line_editor")
{
LLLineEditor* ctrl = new LLLineEditor(std::string("line_editor"),
LLRect(0, width, width, 0), std::string(""));
ctrl->setEnabled(enabled);
ctrl->setValue(value);
LLScrollListLineEditor* cell = new LLScrollListLineEditor(ctrl,width);
if (has_color)
{
cell->setColor(color);
}
new_item->setColumn(index, cell);
}
// </edit>
else else
{ {
LLScrollListText* cell = new LLScrollListText(value.asString(), font, width, font_style, font_alignment, fcolor, TRUE); LLScrollListText* cell = new LLScrollListText(value.asString(), font, width, font_style, font_alignment, fcolor, TRUE);

25
indra/llui/llscrolllistctrl.h
View File

@@ -50,7 +50,6 @@
#include "llresizebar.h" #include "llresizebar.h"
#include "lldate.h" #include "lldate.h"
// <edit> // <edit>
#include "lllineeditor.h"
#include <boost/function.hpp> #include <boost/function.hpp>
// </edit> // </edit>
@@ -194,30 +193,6 @@ private:
LLDate mDate; LLDate mDate;
}; };
// <edit>
class LLScrollListLineEditor : public LLScrollListCell
{
public:
LLScrollListLineEditor( LLLineEditor* line_editor, S32 width = 0);
/*virtual*/ ~LLScrollListLineEditor();
virtual void draw(const LLColor4& color, const LLColor4& highlight_color) const;
virtual S32 getHeight() const { return 0; }
virtual const LLSD getValue() const { return mLineEditor->getValue(); }
virtual void setValue(const LLSD& value) { mLineEditor->setValue(value); }
virtual void onCommit() { mLineEditor->onCommit(); }
virtual BOOL handleClick();
virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
virtual BOOL handleUnicodeCharHere(llwchar uni_char );
virtual void setEnabled(BOOL enable) { mLineEditor->setEnabled(enable); }
LLLineEditor* getLineEditor() { return mLineEditor; }
virtual BOOL isText() const { return FALSE; }
private:
LLLineEditor* mLineEditor;
};
// </edit>
class LLScrollListColumn; class LLScrollListColumn;
class LLScrollColumnHeader : public LLComboBox class LLScrollColumnHeader : public LLComboBox
{ {