Expanded parser.

Added regex support for Common::String
Changed drawstep state saving.

svn-id: r32729

1 files changed, 9 insertions, 0 deletions

diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h
index 956a6d1df2..c5ee55dbbf 100644
--- a/gui/ThemeParser.h
+++ b/gui/ThemeParser.h
@@ -34,6 +34,8 @@
 #include "common/hash-str.h"
 #include "common/stack.h"
 
+#include "graphics/VectorRenderer.h"
+
 /**
  *********************************************
  ** Theme Description File format overview. **
@@ -302,10 +304,13 @@ func = "fill"
 
 namespace GUI {
 
+using namespace Graphics;
+
 class ThemeParser {
 
 	static const int kParserMaxDepth = 4;
 	typedef void (ThemeParser::*ParserCallback)();
+	typedef void (VectorRenderer::*DrawingFunctionCallback)(const Common::Rect &, const DrawStep &);
 
 public:
 	ThemeParser() {
@@ -337,6 +342,8 @@ protected:
 	void parseActiveKey(bool closed);
 	void parserError(const char *errorString);
 
+	Graphics::DrawStep *newDrawStep();
+
 	inline bool skipSpaces() {
 		if (!isspace(_text[_pos]))
 			return false;
@@ -395,7 +402,9 @@ protected:
 	};
 
 	Common::FixedStack<ParserNode*, kParserMaxDepth> _activeKey;
+
 	Common::HashMap<Common::String, ParserCallback, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _callbacks;
+	Common::HashMap<Common::String, DrawingFunctionCallback, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _drawFunctions;
 };
 
 }