diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-05-08 17:10:02 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-05-08 17:10:02 +0300 |
| commit | 81e2fb5eeeae47d04ff9b7e9a0ecacb6b9ca64e5 (patch) | |
| tree | 6b9c341df4a882596f4f6d7abe444a7bffe69ae9 /src/gui/widgets/window.cpp | |
| parent | 28f571be9dbbb77ef32436fe060f8df5b55576cb (diff) | |
| download | manaplus-81e2fb5eeeae47d04ff9b7e9a0ecacb6b9ca64e5.tar.gz manaplus-81e2fb5eeeae47d04ff9b7e9a0ecacb6b9ca64e5.tar.bz2 manaplus-81e2fb5eeeae47d04ff9b7e9a0ecacb6b9ca64e5.tar.xz manaplus-81e2fb5eeeae47d04ff9b7e9a0ecacb6b9ca64e5.zip | |
Unshadow variable mParent between Window and Widget.
Diffstat (limited to 'src/gui/widgets/window.cpp')
| -rw-r--r-- | src/gui/widgets/window.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 5abe278c9..86c2188d1 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -129,7 +129,7 @@ Window::Window(const std::string &caption, mShowTitle(true), mLastRedraw(true), mGrip(nullptr), - mParent(parent), + mParentWindow(parent), mLayout(nullptr), mCloseRect(), mStickyRect(), |