From 4863638cbb100e359abf1b859b549f8fb3c030e0 Mon Sep 17 00:00:00 2001
From: Peter Schojer <peter.schojer@appinf.com>
Date: Thu, 6 Nov 2008 11:46:05 +0000
Subject: [PATCH] linux fixes

---
 WebWidgets/ExtJS/Makefile                           | 4 +++-
 WebWidgets/ExtJS/samples/Picross/Picross.properties | 3 ++-
 WebWidgets/Makefile                                 | 4 +++-
 WebWidgets/include/Poco/WebWidgets/Getter.h         | 6 +++---
 WebWidgets/src/Template.cpp                         | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/WebWidgets/ExtJS/Makefile b/WebWidgets/ExtJS/Makefile
index cce17c0b1..1f5fc90da 100644
--- a/WebWidgets/ExtJS/Makefile
+++ b/WebWidgets/ExtJS/Makefile
@@ -22,7 +22,9 @@ objects = AbstractTableCellHandler ArrayTableSerializer \
 	TableCellHandlerFactory TableRenderer TabViewRenderer \
 	TextEditCellRenderer TextFieldCellRenderer \
 	TimeFieldCellRenderer ToggleButtonCellRenderer \
-	Utility VerticalLayoutRenderer 
+	Utility VerticalLayoutRenderer  \
+	DynamicCodeLoaderRenderer AbsoluteLayoutRenderer \
+	TemplateRenderer
 
 target         = PocoExtJS
 target_version = $(LIBVERSION)
diff --git a/WebWidgets/ExtJS/samples/Picross/Picross.properties b/WebWidgets/ExtJS/samples/Picross/Picross.properties
index 86603d3ac..5c8c122a4 100644
--- a/WebWidgets/ExtJS/samples/Picross/Picross.properties
+++ b/WebWidgets/ExtJS/samples/Picross/Picross.properties
@@ -1,3 +1,4 @@
 Picross.port = 9980
 Picross.dataRoot = ${application.configDir}data/
-Picross.extjsRoot = ${application.configDir}../../testsuite/bin/
\ No newline at end of file
+Picross.extjsRoot = ${application.configDir}extjs/
+Picross.puzzles = ${application.configDir}puzzles/
\ No newline at end of file
diff --git a/WebWidgets/Makefile b/WebWidgets/Makefile
index 3b4bdc123..d6cc87aa3 100644
--- a/WebWidgets/Makefile
+++ b/WebWidgets/Makefile
@@ -23,7 +23,9 @@ objects = Renderable Renderer RenderContext LookAndFeel Type Delegate \
 	PasswordField PasswordFieldCell TimeField TimeFieldCell \
 	WebApplication RequestProcessor RequestHandler \
 	SubmitButton SubmitButtonCell ResourceManager \
-	StringFormatter WebWidgetsException JSDelegate
+	StringFormatter WebWidgetsException JSDelegate \
+	SortedTableModel AjaxDelegate AbsoluteLayout \
+	DynamicCodeLoader Template
 
 target         = PocoWebWidgets
 target_version = $(LIBVERSION)
diff --git a/WebWidgets/include/Poco/WebWidgets/Getter.h b/WebWidgets/include/Poco/WebWidgets/Getter.h
index ff443e2d1..d9715e0a7 100644
--- a/WebWidgets/include/Poco/WebWidgets/Getter.h
+++ b/WebWidgets/include/Poco/WebWidgets/Getter.h
@@ -123,10 +123,10 @@ protected:
 };
 
 template <class TObj, class TArg, class TArgIn>
-Getter* getter(const TObj* object, TArg (TObj::*method)(TArgIn in) const)
+Getter* getter(const TObj* object, TArg (TObj::*method)(TArgIn) const, TArgIn in )
 	/// "Constructor" function for a Getter.
 {
-	return new GetterImpl2(object, method, in);
+	return new GetterImpl2<TObj, TArg, TArgIn>(object, method, in);
 }
 
 
@@ -134,7 +134,7 @@ template <class TObj, class TArg>
 Getter* getter(const TObj* object, TArg (TObj::*method)() const)
 	/// "Constructor" function for a Getter.
 {
-	return new GetterImpl(object, method);
+	return new GetterImpl<TObj, TArg>(object, method);
 }
 
 
diff --git a/WebWidgets/src/Template.cpp b/WebWidgets/src/Template.cpp
index cb124bfb9..7c43c1a02 100644
--- a/WebWidgets/src/Template.cpp
+++ b/WebWidgets/src/Template.cpp
@@ -293,7 +293,7 @@ void Template::bind(std::size_t num, const Any& val)
 	else if (type == typeid(Poco::SharedPtr<std::vector<float> >))
 		bindPtr(num, RefAnyCast<Poco::SharedPtr<std::vector<float> > >(val));
 	else if (type == typeid(Poco::SharedPtr<std::vector<double> >))
-		bindPtr(num, RefAnyCast<Poco::SharedPtr<std::vector<double> >>(val));
+		bindPtr(num, RefAnyCast<Poco::SharedPtr<std::vector<double> > >(val));
 	else if (type == typeid(Poco::SharedPtr<std::vector<char> >))
 		bindPtr(num, RefAnyCast<Poco::SharedPtr<std::vector<char> > >(val));
 	else if (type == typeid(Poco::SharedPtr<std::vector<bool> >))