diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-10-28 20:26:31 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-10-28 20:26:31 +0300 |
| commit | 6f496c4919a62edbb73e9adbc3ddd84484afc756 (patch) | |
| tree | 554c64dcc37f1db23877d2de86ecbecb0870152d /src/gui/widgets/guitable.h | |
| parent | b0cac7edfaf55819b7c46e9a082d042470221d7e (diff) | |
| download | manaverse-6f496c4919a62edbb73e9adbc3ddd84484afc756.tar.gz manaverse-6f496c4919a62edbb73e9adbc3ddd84484afc756.tar.bz2 manaverse-6f496c4919a62edbb73e9adbc3ddd84484afc756.tar.xz manaverse-6f496c4919a62edbb73e9adbc3ddd84484afc756.zip | |
Fix conflict for variable mSelectable between two classes.
Diffstat (limited to 'src/gui/widgets/guitable.h')
| -rw-r--r-- | src/gui/widgets/guitable.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index b411eff79..c42ac7ff5 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -159,8 +159,8 @@ class GuiTable final : public Widget, void requestFocus() override; - void setSelectable(bool b) - { mSelectable = b; } + void setSelectableGui(bool b) + { mSelectableGui = b; } protected: /** Frees all action listeners on inner widgets. */ @@ -201,7 +201,7 @@ class GuiTable final : public Widget, bool mLinewiseMode; bool mWrappingEnabled; Opaque mOpaque; - bool mSelectable; + bool mSelectableGui; }; #endif // GUI_WIDGETS_GUITABLE_H |