Moved knowledge about whether we use OpenGL into the Graphics class. Added helper function for being creation to reduce code duplication. Some code simplifications.

1 files changed, 36 insertions, 0 deletions

diff --git a/src/graphics.cpp b/src/graphics.cpp
index 0ee2371d..21797f55 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -192,6 +192,42 @@ void Graphics::setColor(gcn::Color color)
 #endif
 }
 
+void Graphics::popClipArea()
+{
+    if (!useOpenGL) {
+        gcn::SDLGraphics::popClipArea();
+    }
+#ifdef USE_OPENGL
+    else {
+        gcn::OpenGLGraphics::popClipArea();
+    }
+#endif
+}
+
+bool Graphics::pushClipArea(gcn::Rectangle area)
+{
+    if (!useOpenGL) {
+        return gcn::SDLGraphics::pushClipArea(area);
+    }
+#ifdef USE_OPENGL
+    else {
+        return gcn::OpenGLGraphics::pushClipArea(area);
+    }
+#endif
+}
+
+void Graphics::fillRectangle(const gcn::Rectangle &rectangle)
+{
+    if (!useOpenGL) {
+        gcn::SDLGraphics::fillRectangle(rectangle);
+    }
+#ifdef USE_OPENGL
+    else {
+        gcn::OpenGLGraphics::fillRectangle(rectangle);
+    }
+#endif
+}
+
 int Graphics::getWidth()
 {
     return mScreen->w;