From 350dc4290fd5dd8f28af9e63713b48ef2c131f09 Mon Sep 17 00:00:00 2001
From: Jody Northup
Date: Sat, 13 Jun 2009 10:24:52 +0000
Subject: Fixed cursor code to keep track of cursor formats so that ThemeEngine
 and/or GuiManager cursors will render properly over the game (on spacebar
 hit, for instance)

svn-id: r41491
---
 gui/ThemeEngine.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gui/ThemeEngine.h')

diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index a7bec4d9a3..2a7bbcc6ce 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -579,6 +579,9 @@ protected:
 
 	ImagesMap _bitmaps;
 	Graphics::PixelFormat _overlayFormat;
+#ifdef ENABLE_16BIT
+	Graphics::PixelFormat _cursorFormat;
+#endif
 
 	/** List of all the dirty screens that must be blitted to the overlay. */
 	Common::List<Common::Rect> _dirtyScreen;
-- 
cgit v1.2.3


From f7dd1c15ed38418a0371032966144eb6c2e004cb Mon Sep 17 00:00:00 2001
From: Jody Northup
Date: Sat, 20 Jun 2009 05:23:09 +0000
Subject: renamed ENABLE_16BIT define to more accurate ENABLE_RGB_COLOR

svn-id: r41696
---
 gui/ThemeEngine.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gui/ThemeEngine.h')

diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 2a7bbcc6ce..74af16f09f 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -579,7 +579,7 @@ protected:
 
 	ImagesMap _bitmaps;
 	Graphics::PixelFormat _overlayFormat;
-#ifdef ENABLE_16BIT
+#ifdef ENABLE_RGB_COLOR
 	Graphics::PixelFormat _cursorFormat;
 #endif
 
-- 
cgit v1.2.3


From 7c77e2b03a29f8d11ff0a48e4da02ab697334f1e Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 20 Aug 2009 09:23:31 +0000
Subject: Renamed ScummSaveLoad GUI dialog config entry to SaveLoadChooser.
 (Also bumped theme version along with it)

svn-id: r43553
---
 gui/ThemeEngine.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gui/ThemeEngine.h')

diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index cab5f9fd41..dfa27c2c88 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -32,7 +32,7 @@
 #include "graphics/surface.h"
 #include "graphics/fontman.h"
 
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.7"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8"
 
 namespace Graphics {
 	struct DrawStep;
-- 
cgit v1.2.3


From 007f68366fd55a519753bf533c7c3a80db3754f0 Mon Sep 17 00:00:00 2001
From: Andre Heider
Date: Fri, 21 Aug 2009 18:16:37 +0000
Subject: Renamed ENABLE_RGB_COLOR to USE_RGB_COLOR, and added it to config.h
 to guarantee a consistent build.

svn-id: r43604
---
 gui/ThemeEngine.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gui/ThemeEngine.h')

diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 43e227d5fb..9e4bff5075 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -612,7 +612,7 @@ protected:
 
 	ImagesMap _bitmaps;
 	Graphics::PixelFormat _overlayFormat;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
 	Graphics::PixelFormat _cursorFormat;
 #endif
 
-- 
cgit v1.2.3