Merge branch 'master' into strippedstripped1.1.9.18

Conflicts:
	src/guichan/cliprectangle.cpp
	src/guichan/focushandler.cpp
	src/guichan/gui.cpp
	src/guichan/include/guichan/cliprectangle.hpp
	src/guichan/include/guichan/inputevent.hpp
	src/guichan/include/guichan/keyevent.hpp
	src/guichan/include/guichan/mouseevent.hpp
	src/guichan/include/guichan/widgets/button.hpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/include/guichan/widgets/radiobutton.hpp
	src/guichan/include/guichan/widgets/slider.hpp
	src/guichan/include/guichan/widgets/tab.hpp
	src/guichan/include/guichan/widgets/tabbedarea.hpp
	src/guichan/include/guichan/widgets/textfield.hpp
	src/guichan/include/guichan/widgets/window.hpp
	src/guichan/inputevent.cpp
	src/guichan/keyevent.cpp
	src/guichan/mouseevent.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/button.cpp
	src/guichan/widgets/checkbox.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/radiobutton.cpp
	src/guichan/widgets/slider.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textfield.cpp
	src/guichan/widgets/window.cpp

1 files changed, 11 insertions, 12 deletions

diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp
index e93066b96..46e482df6 100644
--- a/src/opengl1graphics.cpp
+++ b/src/opengl1graphics.cpp
@@ -517,22 +517,22 @@ bool OpenGL1Graphics::pushClipArea(gcn::Rectangle area)
 
     if (!mClipStack.empty())
     {
-        transX = -mClipStack.top().xOffset;
-        transY = -mClipStack.top().yOffset;
+        const gcn::ClipRectangle &clipArea = mClipStack.top();
+        transX = -clipArea.xOffset;
+        transY = -clipArea.yOffset;
     }
 
     bool result = gcn::Graphics::pushClipArea(area);
 
-    transX += mClipStack.top().xOffset;
-    transY += mClipStack.top().yOffset;
+    const gcn::ClipRectangle &clipArea = mClipStack.top();
+    transX += clipArea.xOffset;
+    transY += clipArea.yOffset;
 
     glPushMatrix();
     glTranslatef(static_cast<GLfloat>(transX),
                  static_cast<GLfloat>(transY), 0);
-    glScissor(mClipStack.top().x,
-            mTarget->h - mClipStack.top().y - mClipStack.top().height,
-            mClipStack.top().width,
-            mClipStack.top().height);
+    glScissor(clipArea.x, mTarget->h - clipArea.y - clipArea.height,
+        clipArea.width, clipArea.height);
 
     return result;
 }
@@ -545,10 +545,9 @@ void OpenGL1Graphics::popClipArea()
         return;
 
     glPopMatrix();
-    glScissor(mClipStack.top().x,
-              mTarget->h - mClipStack.top().y - mClipStack.top().height,
-              mClipStack.top().width,
-              mClipStack.top().height);
+    const gcn::ClipRectangle &clipArea = mClipStack.top();
+    glScissor(clipArea.x, mTarget->h - clipArea.y - clipArea.height,
+        clipArea.width, clipArea.height);
 }
 
 void OpenGL1Graphics::setColor(const gcn::Color& color)