summaryrefslogtreecommitdiff
path: root/src/gui/widgets/window.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-30 16:06:19 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-30 16:59:12 +0300
commit60d90692e487948b77edcac63acbef34254cea5b (patch)
treec2ca72f720f835099bc65c2832d5c7df3d92abbd /src/gui/widgets/window.h
parent38fe5f43b5ac41e41debed4868e81b4b4bf839ac (diff)
downloadmv-60d90692e487948b77edcac63acbef34254cea5b.tar.gz
mv-60d90692e487948b77edcac63acbef34254cea5b.tar.bz2
mv-60d90692e487948b77edcac63acbef34254cea5b.tar.xz
mv-60d90692e487948b77edcac63acbef34254cea5b.zip
remove duplicate variables.
Diffstat (limited to 'src/gui/widgets/window.h')
-rw-r--r--src/gui/widgets/window.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 139dbcb1d..f6c5d0765 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -482,7 +482,7 @@ class Window : public gcn::Window,
int mMaxWinHeight; /**< Maximum window height */
static int mouseResize; /**< Active resize handles */
- static int instances; /**< Number of Window instances */
+ static int windowInstances; /**< Number of Window instances */
/**
@@ -502,7 +502,7 @@ class Window : public gcn::Window,
gcn::Font *mCaptionFont;
bool mShowTitle; /**< Window has a title bar */
bool mModal; /**< Window is modal */
- bool mCloseButton; /**< Window has a close button */
+ bool mCloseWindowButton; /**< Window has a close button */
bool mDefaultVisible; /**< Window's default visibility */
bool mSaveVisible; /**< Window will save visibility */
bool mStickyButton; /**< Window has a sticky button */