summaryrefslogtreecommitdiff
path: root/src/gui/windowmenu.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-14 01:31:22 +0300
commit311c175f3184103950c72bc5c775174597430b83 (patch)
treead022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/gui/windowmenu.h
parent16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff)
downloadmv-311c175f3184103950c72bc5c775174597430b83.tar.gz
mv-311c175f3184103950c72bc5c775174597430b83.tar.bz2
mv-311c175f3184103950c72bc5c775174597430b83.tar.xz
mv-311c175f3184103950c72bc5c775174597430b83.zip
Replace std::vector into macro STD_VECTOR.
In most case it equal to std::vector except debug modes. Now it can be also mse::mstd::vector, but sadly this class not support all required features.
Diffstat (limited to 'src/gui/windowmenu.h')
-rw-r--r--src/gui/windowmenu.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index 106c33e25..780fe29ea 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -68,10 +68,10 @@ class WindowMenu final : public Container,
std::map <std::string, ButtonInfo*> &getButtonNames() A_WARN_UNUSED
{ return mButtonNames; }
- std::vector <Button*> &getButtons() A_WARN_UNUSED
+ STD_VECTOR <Button*> &getButtons() A_WARN_UNUSED
{ return mButtons; }
- std::vector <ButtonText*> &getButtonTexts() A_WARN_UNUSED
+ STD_VECTOR <ButtonText*> &getButtonTexts() A_WARN_UNUSED
{ return mButtonTexts; }
void showButton(const std::string &name, const Visible visible);
@@ -105,8 +105,8 @@ class WindowMenu final : public Container,
Skin *mSkin;
int mPadding;
int mSpacing;
- std::vector <Button*> mButtons;
- std::vector <ButtonText*> mButtonTexts;
+ STD_VECTOR <Button*> mButtons;
+ STD_VECTOR <ButtonText*> mButtonTexts;
std::map <std::string, ButtonInfo*> mButtonNames;
bool mHaveMouse;
int mAutoHide;