From 370cb1fa897604e5d7bf9543881afad80f45f3ba Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 2 Sep 2013 21:02:34 +0300 Subject: dehardcode some mode render mode constans usage. --- src/gui/equipmentwindow.cpp | 2 +- src/gui/widgets/button.cpp | 2 +- src/gui/widgets/popup.cpp | 2 +- src/gui/widgets/progressbar.cpp | 2 +- src/gui/widgets/scrollarea.cpp | 4 ++-- src/gui/widgets/shortcutcontainer.cpp | 2 +- src/gui/widgets/tab.cpp | 2 +- src/gui/widgets/window.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/gui') diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index af010a2d6..8e51dae72 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -161,7 +161,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics) gcn::Font *const font = getFont(); const int fontHeight = font->getHeight(); - if (openGLMode != 2) + if (openGLMode != RENDER_SAFE_OPENGL) { if (mLastRedraw) { diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 1fb4fa5e4..37213369d 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -431,7 +431,7 @@ void Button::draw(gcn::Graphics *graphics) } } - if (openGLMode != 2) + if (openGLMode != RENDER_SAFE_OPENGL) { if (recalc) { diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 438b5db29..e71e65c14 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -103,7 +103,7 @@ void Popup::draw(gcn::Graphics *graphics) if (mSkin) { - if (openGLMode != 2) + if (openGLMode != RENDER_SAFE_OPENGL) { if (mRedraw) { diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index dc1e02ac5..2c3b13354 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -180,7 +180,7 @@ void ProgressBar::render(Graphics *graphics) if (!mSkin) return; - if (openGLMode != 2) + if (openGLMode != RENDER_SAFE_OPENGL) { if (mRedraw || graphics->getRedraw()) { diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index ec03e5cea..03466b90e 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -262,7 +262,7 @@ void ScrollArea::draw(gcn::Graphics *graphics) BLOCK_START("ScrollArea::draw") if (mVBarVisible || mHBarVisible) { - if (openGLMode != 2) + if (openGLMode != RENDER_SAFE_OPENGL) { if (!mOpaque) updateCalcFlag(graphics); @@ -363,7 +363,7 @@ void ScrollArea::drawFrame(gcn::Graphics *graphics) updateCalcFlag(graphics); - if (openGLMode != 2) + if (openGLMode != RENDER_SAFE_OPENGL) { if (mRedraw) { diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp index ed3c32f04..9c651fce1 100644 --- a/src/gui/widgets/shortcutcontainer.cpp +++ b/src/gui/widgets/shortcutcontainer.cpp @@ -93,7 +93,7 @@ void ShortcutContainer::drawBackground(Graphics *g) { if (mBackgroundImg) { - if (openGLMode != 2) + if (openGLMode != RENDER_SAFE_OPENGL) { if (mRedraw) { diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index ac91442fb..f1dc59c60 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -221,7 +221,7 @@ void Tab::draw(gcn::Graphics *graphics) if (skin) { // draw tab - if (openGLMode != 2) + if (openGLMode != RENDER_SAFE_OPENGL) { const ImageRect &rect = skin->getBorder(); if (mRedraw || mode != mMode || g->getRedraw()) diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 7d6174311..fadd962c4 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -214,7 +214,7 @@ void Window::draw(gcn::Graphics *graphics) Graphics *const g = static_cast(graphics); bool update = false; - if (openGLMode != 2) + if (openGLMode != RENDER_SAFE_OPENGL) { if (mResizeHandles != mOldResizeHandles) { -- cgit v1.2.3-60-g2f50