diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-04-14 11:27:04 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-04-14 12:34:23 +0300 |
commit | a7d7346b9eb3fa62a8912e31d5c00f8e05390425 (patch) | |
tree | ba2d006e8aaac74138eb13ba458d30abf8f01182 /src/guichan/gui.cpp | |
parent | 9569f124d176b4220f28f9a41812c33883737228 (diff) | |
download | manaplus-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.gz manaplus-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.bz2 manaplus-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.xz manaplus-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.zip |
some more style fixes from cpplint.
Diffstat (limited to 'src/guichan/gui.cpp')
-rw-r--r-- | src/guichan/gui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/guichan/gui.cpp b/src/guichan/gui.cpp index a72b70f84..d91ac7ee0 100644 --- a/src/guichan/gui.cpp +++ b/src/guichan/gui.cpp @@ -479,7 +479,7 @@ namespace gcn { Widget *const widget = getWidgetAt(x, y); - //+++ possible nullpointer + // +++ possible nullpointer if (mFocusHandler->getModalMouseInputFocused() && !widget->isModalMouseInputFocused()) { @@ -493,7 +493,7 @@ namespace gcn { Widget* widget = mFocusHandler->getFocused(); - //+++ possible nullpointer + // +++ possible nullpointer while (widget->_getInternalFocusHandler() && widget->_getInternalFocusHandler()->getFocused()) { @@ -716,7 +716,7 @@ namespace gcn { BLOCK_START("Gui::handleModalMouseInputFocus") // Check if modal mouse input focus has been gained by a widget. - if ((mFocusHandler->getLastWidgetWithModalMouseInputFocus() + if ((mFocusHandler->getLastWidgetWithModalMouseInputFocus() != mFocusHandler->getModalMouseInputFocused()) && (!mFocusHandler->getLastWidgetWithModalMouseInputFocus())) { @@ -739,7 +739,7 @@ namespace gcn { BLOCK_START("Gui::handleModalFocus") // Check if modal focus has been gained by a widget. - if ((mFocusHandler->getLastWidgetWithModalFocus() + if ((mFocusHandler->getLastWidgetWithModalFocus() != mFocusHandler->getModalFocused()) && (!mFocusHandler->getLastWidgetWithModalFocus())) { @@ -827,4 +827,4 @@ namespace gcn parent = swap->getParent(); } } -} +} // namespace gcn |