[Scummvm-cvs-logs] SF.net SVN: scummvm: [21790] scummvm/trunk/gui

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Tue Apr 11 07:17:05 CEST 2006


Revision: 21790
Author:   lordhoto
Date:     2006-04-11 07:16:15 -0700 (Tue, 11 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21790&view=rev

Log Message:
-----------
Makes classic theme compile without OLDGUI_TRANSPARENCY again.

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeClassic.cpp
    scummvm/trunk/gui/theme.h
Modified: scummvm/trunk/gui/ThemeClassic.cpp
===================================================================
--- scummvm/trunk/gui/ThemeClassic.cpp	2006-04-11 12:59:47 UTC (rev 21789)
+++ scummvm/trunk/gui/ThemeClassic.cpp	2006-04-11 14:16:15 UTC (rev 21790)
@@ -453,6 +453,7 @@
 	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 @@
 			}
 		}
 	}
+#endif
 	return true;
 }
 

Modified: scummvm/trunk/gui/theme.h
===================================================================
--- scummvm/trunk/gui/theme.h	2006-04-11 12:59:47 UTC (rev 21789)
+++ scummvm/trunk/gui/theme.h	2006-04-11 14:16:15 UTC (rev 21790)
@@ -301,7 +301,7 @@
 	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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list