From 7bbe721a23b9caba7a67ac806be10aa536f7f46d Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Wed, 10 Aug 2005 07:46:41 +0000 Subject: Moved knowledge about whether we use OpenGL into the Graphics class. Added helper function for being creation to reduce code duplication. Some code simplifications. --- src/gui/browserbox.cpp | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) (limited to 'src/gui/browserbox.cpp') diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp index 52a13763..504fb987 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -211,14 +211,7 @@ void BrowserBox::draw(gcn::Graphics* graphics) if (mOpaque) { graphics->setColor(gcn::Color(BGCOLOR)); - if (useOpenGL) { -#ifdef USE_OPENGL - dynamic_cast(graphics)->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight())); -#endif - } - else { - dynamic_cast(graphics)->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight())); - } + graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight())); } if (mSelectedLink >= 0) @@ -226,26 +219,12 @@ void BrowserBox::draw(gcn::Graphics* graphics) if ((mHighMode == BACKGROUND) || (mHighMode == BOTH)) { graphics->setColor(gcn::Color(HIGHLIGHT)); - if (useOpenGL) { -#ifdef USE_OPENGL - dynamic_cast(graphics)->fillRectangle( - gcn::Rectangle( - mLinks[mSelectedLink].x1, - mLinks[mSelectedLink].y1, - mLinks[mSelectedLink].x2 - mLinks[mSelectedLink].x1, - mLinks[mSelectedLink].y2 - mLinks[mSelectedLink].y1 - )); -#endif - } - else { - dynamic_cast(graphics)->fillRectangle( - gcn::Rectangle( - mLinks[mSelectedLink].x1, - mLinks[mSelectedLink].y1, - mLinks[mSelectedLink].x2 - mLinks[mSelectedLink].x1, - mLinks[mSelectedLink].y2 - mLinks[mSelectedLink].y1 - )); - } + graphics->fillRectangle(gcn::Rectangle( + mLinks[mSelectedLink].x1, + mLinks[mSelectedLink].y1, + mLinks[mSelectedLink].x2 - mLinks[mSelectedLink].x1, + mLinks[mSelectedLink].y2 - mLinks[mSelectedLink].y1 + )); } if ((mHighMode == UNDERLINE) || (mHighMode == BOTH)) -- cgit v1.2.3-60-g2f50