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/widget.cpp | |
parent | 9569f124d176b4220f28f9a41812c33883737228 (diff) | |
download | mv-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.gz mv-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.bz2 mv-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.tar.xz mv-a7d7346b9eb3fa62a8912e31d5c00f8e05390425.zip |
some more style fixes from cpplint.
Diffstat (limited to 'src/guichan/widget.cpp')
-rw-r--r-- | src/guichan/widget.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/guichan/widget.cpp b/src/guichan/widget.cpp index 00e3decf6..dcd64371e 100644 --- a/src/guichan/widget.cpp +++ b/src/guichan/widget.cpp @@ -177,7 +177,7 @@ namespace gcn } void Widget::setDimension(const Rectangle& dimension) - { + { const Rectangle oldDimension = mDimension; mDimension = dimension; @@ -317,8 +317,8 @@ namespace gcn const Color& Widget::getSelectionColor() const { return mSelectionColor; - } - + } + void Widget::_setFocusHandler(FocusHandler* focusHandler) { if (mFocusHandler) @@ -535,7 +535,7 @@ namespace gcn if (mParent) { - return (mFocusHandler->getModalFocused() == this) + return (mFocusHandler->getModalFocused() == this) || mParent->isModalFocused(); } @@ -552,7 +552,7 @@ namespace gcn if (mParent) { - return (mFocusHandler->getModalMouseInputFocused() == this) + return (mFocusHandler->getModalMouseInputFocused() == this) || mParent->isModalMouseInputFocused(); } @@ -664,4 +664,4 @@ namespace gcn if (mParent) mParent->showWidgetPart(this, rectangle); } -} +} // namespace gcn |