Index: inc/canvas/propertysethelper.hxx
===================================================================
RCS file: /cvs/gsl/canvas/inc/canvas/propertysethelper.hxx,v
retrieving revision 1.2
diff -u -p -r1.2 propertysethelper.hxx
--- canvas/inc/canvas/propertysethelper.hxx	2 Nov 2005 12:40:50 -0000	1.2
+++ canvas/inc/canvas/propertysethelper.hxx	14 Jun 2007 12:53:29 -0000
@@ -84,14 +84,20 @@ namespace canvas
         class MakeMap : public InputMap
         {
         public:
-            explicit MakeMap(const char*        name,
-                             const GetterType&  getter,
-                             const SetterType&  setter)
+            MakeMap(const char*        name,
+                    const GetterType&  getter,
+                    const SetterType&  setter)
             {
                 MapType::MapEntry aEntry={name, {getter, setter}};
                 this->push_back(aEntry);
             }
-            MakeMap& operator()(const char*        name,
+            MakeMap(const char*       name,
+                    const GetterType& getter)
+            {
+                MapType::MapEntry aEntry={name, {getter, SetterType()}};
+                this->push_back(aEntry);
+            }
+            MakeMap& operator()(const char*        name,
                                 const GetterType&  getter,
                                 const SetterType&  setter)
             {
@@ -99,7 +105,14 @@ namespace canvas
                 this->push_back(aEntry);
                 return *this;
             }
-        };
+            MakeMap& operator()(const char*       name,
+                                const GetterType& getter)
+            {
+                MapType::MapEntry aEntry={name, {getter, SetterType()}};
+                this->push_back(aEntry);
+                return *this;
+            }
+        };
 
         /** Create helper with zero properties
          */
Index: inc/canvas/base/graphicdevicebase.hxx
===================================================================
RCS file: /cvs/gsl/canvas/inc/canvas/base/graphicdevicebase.hxx,v
retrieving revision 1.5
diff -u -p -r1.5 graphicdevicebase.hxx
--- canvas/inc/canvas/base/graphicdevicebase.hxx	13 Dec 2006 14:36:17 -0000	1.5
+++ canvas/inc/canvas/base/graphicdevicebase.hxx	14 Jun 2007 12:53:29 -0000
@@ -157,12 +157,10 @@ namespace canvas
             maPropHelper.initProperties( PropertySetHelper::MakeMap
                                          ("DeviceHandle",
                                           boost::bind(&DeviceHelper::getDeviceHandle,
-                                                      boost::ref(maDeviceHelper)),
-                                          NULL)
+                                                      boost::ref(maDeviceHelper)))
                                          ("SurfaceHandle",  
                                           boost::bind(&DeviceHelper::getSurfaceHandle,
-                                                      boost::ref(maDeviceHelper)),
-                                          NULL)
+                                                      boost::ref(maDeviceHelper)))
                                          ("DumpScreenContent",  
                                           boost::bind(&ThisType::getDumpScreenContent,
                                                       this),
Index: inc/canvas/base/windowgraphicdevicebase.hxx
===================================================================
RCS file: /cvs/gsl/canvas/inc/canvas/base/windowgraphicdevicebase.hxx,v
retrieving revision 1.4
diff -u -p -r1.4 windowgraphicdevicebase.hxx
--- canvas/inc/canvas/base/windowgraphicdevicebase.hxx	13 Dec 2006 14:36:46 -0000	1.4
+++ canvas/inc/canvas/base/windowgraphicdevicebase.hxx	14 Jun 2007 12:53:29 -0000
@@ -115,8 +115,7 @@ namespace canvas
             BaseType::maPropHelper.addProperties( PropertySetHelper::MakeMap
                                                   ("Window",
                                                    boost::bind(&OurType::getXWindow,
-                                                               this),
-                                                   NULL));
+                                                               this)));
         }
 
         /** Set corresponding canvas window
