aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2006-04-11 14:16:15 +0000
committerJohannes Schickel2006-04-11 14:16:15 +0000
commit12374accc3b032addf141e8df26d70e2b7adf819 (patch)
tree1f37d4ec1c054d56602f5825924976276107f95f
parenta42dd86e85fa06a06383f99346d7bedf424cac5b (diff)
downloadscummvm-rg350-12374accc3b032addf141e8df26d70e2b7adf819.tar.gz
scummvm-rg350-12374accc3b032addf141e8df26d70e2b7adf819.tar.bz2
scummvm-rg350-12374accc3b032addf141e8df26d70e2b7adf819.zip
Makes classic theme compile without OLDGUI_TRANSPARENCY again.
svn-id: r21790
-rw-r--r--gui/ThemeClassic.cpp2
-rw-r--r--gui/theme.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/gui/ThemeClassic.cpp b/gui/ThemeClassic.cpp
index a1eca02918..7b02b3242b 100644
--- a/gui/ThemeClassic.cpp
+++ b/gui/ThemeClassic.cpp
@@ -453,6 +453,7 @@ bool ThemeClassic::addDirtyRect(Common::Rect r, bool save) {
r.clip(_screen.w, _screen.h);
r.clip(_drawArea);
_system->copyRectToOverlay((OverlayColor*)_screen.getBasePtr(r.left, r.top), _screen.w, r.left, r.top, r.width(), r.height());
+#ifdef OLDGUI_TRANSPARENCY
if (_dialog && save) {
if (_dialog->screen.pixels) {
OverlayColor *dst = (OverlayColor*)_dialog->screen.getBasePtr(r.left, r.top);
@@ -465,6 +466,7 @@ bool ThemeClassic::addDirtyRect(Common::Rect r, bool save) {
}
}
}
+#endif
return true;
}
diff --git a/gui/theme.h b/gui/theme.h
index bf13ad72eb..6526aa67e0 100644
--- a/gui/theme.h
+++ b/gui/theme.h
@@ -301,7 +301,7 @@ public:
void drawScrollbar(const Common::Rect &r, int sliderY, int sliderHeight, kScrollbarState, kState state);
void drawCaret(const Common::Rect &r, bool erase, kState state);
void drawLineSeparator(const Common::Rect &r, kState state);
- const Graphics::Surface *getImageSurface(int n) { return _images[n]; }
+ const Graphics::Surface *getImageSurface(int n) { return _images[n]; }
private:
bool addDirtyRect(Common::Rect r, bool backup = false, bool special = false);