Fresco/Berlin/modules/Layout LayoutKitImpl.cc,1.30,1.31 LayoutKitImpl.hh,1.22,1.23

Update of /cvs/fresco/Fresco/Berlin/modules/Layout
In directory purcel:/tmp/cvs-serv31700/Berlin/modules/Layout

Modified Files:
	LayoutKitImpl.cc LayoutKitImpl.hh 
Log Message:
a somewhat lengthy fix for http://issues.fresco.org/bug92

Index: LayoutKitImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Layout/LayoutKitImpl.cc,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- LayoutKitImpl.cc	25 Jan 2003 22:37:02 -0000	1.30
+++ LayoutKitImpl.cc	18 Feb 2003 07:26:32 -0000	1.31
@@ -42,14 +42,15 @@
 using namespace Berlin::LayoutKit;
 
 LayoutKitImpl::LayoutKitImpl(const std::string &id,
-			     const Fresco::Kit::PropertySeq &p)
-    : KitImpl(id, p), _fill(GraphicImpl::infinity) { }
+			     const Fresco::Kit::PropertySeq &p,
+			     ServerContextImpl *c)
+    : KitImpl(id, p, c), my_fill(GraphicImpl::infinity) { }
 
 LayoutKitImpl::~LayoutKitImpl() {}
 
-void LayoutKitImpl::fill(Coord c) { _fill = c; }
+void LayoutKitImpl::fill(Coord c) { my_fill = c; }
 
-Coord LayoutKitImpl::fill() { return _fill; }
+Coord LayoutKitImpl::fill() { return my_fill; }
 
 Graphic_ptr LayoutKitImpl::clipper(Graphic_ptr g)
 {
@@ -191,12 +192,12 @@
 
 Graphic_ptr LayoutKitImpl::hfill()
 {
-    return create<Graphic>(new Glue(xaxis, 0., _fill, 0., 0.));
+    return create<Graphic>(new Glue(xaxis, 0., my_fill, 0., 0.));
 }
 
 Graphic_ptr LayoutKitImpl::hglue_fill(Coord natural)
 {
-    return create<Graphic>(new Glue(xaxis, natural, _fill, 0., 0.));
+    return create<Graphic>(new Glue(xaxis, natural, my_fill, 0., 0.));
 }
 
 Graphic_ptr LayoutKitImpl::hglue(Coord natural,
@@ -220,12 +221,12 @@
 
 Graphic_ptr LayoutKitImpl::vfill()
 {
-    return create<Graphic>(new Glue(yaxis, 0., _fill, 0., 0.));
+    return create<Graphic>(new Glue(yaxis, 0., my_fill, 0., 0.));
 }
 
 Graphic_ptr LayoutKitImpl::vglue_fill(Coord natural)
 {
-    return create<Graphic>(new Glue(yaxis, natural, _fill, 0., 0.));
+    return create<Graphic>(new Glue(yaxis, natural, my_fill, 0., 0.));
 }
 
 Graphic_ptr LayoutKitImpl::vglue(Coord natural,
@@ -346,7 +347,7 @@
 
 Graphic_ptr LayoutKitImpl::flexible_fill(Graphic_ptr g)
 {
-    return flexible(g, _fill, 0.);
+    return flexible(g, my_fill, 0.);
 }
 
 Graphic_ptr
@@ -552,5 +553,5 @@
 extern "C" KitImpl *load()
 {
   static std::string properties[] = {"implementation", "LayoutKitImpl"};
-  return create_kit<LayoutKitImpl> ("IDL:fresco.org/Fresco/LayoutKit:1.0", properties, 2);
+  return create_prototype<LayoutKitImpl> ("IDL:fresco.org/Fresco/LayoutKit:1.0", properties, 2);
 }

Index: LayoutKitImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Layout/LayoutKitImpl.hh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- LayoutKitImpl.hh	23 Jan 2003 22:31:04 -0000	1.22
+++ LayoutKitImpl.hh	18 Feb 2003 07:26:32 -0000	1.23
@@ -29,16 +29,21 @@
 
 class GraphicImpl;
 
-namespace Berlin {
-namespace LayoutKit {
+namespace Berlin 
+{
+namespace LayoutKit 
+{
 
 class LayoutKitImpl : public virtual POA_Fresco::LayoutKit,
 		      public KitImpl
 {
 public:
-  LayoutKitImpl(const std::string &, const Fresco::Kit::PropertySeq &);
+  LayoutKitImpl(const std::string &,
+		const Fresco::Kit::PropertySeq &,
+		ServerContextImpl *);
   ~LayoutKitImpl();
-  virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p) { return new LayoutKitImpl(repo_id(), p);}
+  virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p, ServerContextImpl *c)
+  { return new LayoutKitImpl(repo_id(), p, c);}
 
   virtual Fresco::Coord fill();
   virtual void fill(Fresco::Coord);
@@ -119,7 +124,7 @@
   virtual Fresco::Graphic_ptr tmargin(Fresco::Graphic_ptr, Fresco::Coord);
   virtual Fresco::Graphic_ptr tmargin_flexible(Fresco::Graphic_ptr, Fresco::Coord, Fresco::Coord, Fresco::Coord);
 private:
-  Fresco::Coord _fill;
+  Fresco::Coord my_fill;
 };
 
 } // namespace