summaryrefslogtreecommitdiff
path: root/src/gui/widgets/guitable.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-10-28 20:26:31 +0300
committerAndrei Karas <akaras@inbox.ru>2016-10-28 20:26:31 +0300
commit6f496c4919a62edbb73e9adbc3ddd84484afc756 (patch)
tree554c64dcc37f1db23877d2de86ecbecb0870152d /src/gui/widgets/guitable.cpp
parentb0cac7edfaf55819b7c46e9a082d042470221d7e (diff)
downloadmv-6f496c4919a62edbb73e9adbc3ddd84484afc756.tar.gz
mv-6f496c4919a62edbb73e9adbc3ddd84484afc756.tar.bz2
mv-6f496c4919a62edbb73e9adbc3ddd84484afc756.tar.xz
mv-6f496c4919a62edbb73e9adbc3ddd84484afc756.zip
Fix conflict for variable mSelectable between two classes.
Diffstat (limited to 'src/gui/widgets/guitable.cpp')
-rw-r--r--src/gui/widgets/guitable.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 9009b914c..4447904ae 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -54,7 +54,7 @@ GuiTable::GuiTable(const Widget2 *const widget,
mLinewiseMode(false),
mWrappingEnabled(false),
mOpaque(opacity),
- mSelectable(true)
+ mSelectableGui(true)
{
mAllowLogic = false;
mBackgroundColor = getThemeColor(ThemeColorId::BACKGROUND);
@@ -104,7 +104,7 @@ void GuiTable::recomputeDimensions()
const int columns_nr = mModel->getColumns();
int width = 0;
- if (mSelectable)
+ if (mSelectableGui)
{
if (mSelectedRow >= rows_nr)
mSelectedRow = rows_nr - 1;
@@ -148,7 +148,7 @@ int GuiTable::getColumnWidth(const int i) const
void GuiTable::setSelectedRow(const int selected)
{
- if (!mSelectable)
+ if (!mSelectableGui)
{
mSelectedRow = -1;
}
@@ -523,7 +523,7 @@ void GuiTable::keyPressed(KeyEvent& event)
// -- MouseListener notifications
void GuiTable::mousePressed(MouseEvent& event)
{
- if (!mSelectable)
+ if (!mSelectableGui)
return;
if (event.getButton() == MouseButton::LEFT)