Fresco/Berlin/modules/Desktop DesktopKitImpl.cc,1.49,1.50 WindowImpl.cc,1.38,1.39

Update of /cvs/fresco/Fresco/Berlin/modules/Desktop
In directory purcel:/tmp/cvs-serv22008/modules/Desktop

Modified Files:
	DesktopKitImpl.cc WindowImpl.cc 
Log Message:
Move the create template from the LayoutKit into KitImpl.hh and use it
in all Kits.


Index: DesktopKitImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Desktop/DesktopKitImpl.cc,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- DesktopKitImpl.cc	5 Jan 2003 16:21:29 -0000	1.49
+++ DesktopKitImpl.cc	23 Jan 2003 22:31:02 -0000	1.50
@@ -42,29 +42,45 @@
 
 using namespace Berlin::DesktopKit;
 
-DesktopKitImpl::DesktopKitImpl(const std::string &id, const Fresco::Kit::PropertySeq &p)
-  : KitImpl(id, p) {}
-DesktopKitImpl::~DesktopKitImpl() {}
+DesktopKitImpl::DesktopKitImpl(const std::string &id,
+			       const Fresco::Kit::PropertySeq &p)
+  : KitImpl(id, p) { }
+DesktopKitImpl::~DesktopKitImpl() { }
+
 void DesktopKitImpl::bind(ServerContext_ptr context)
 {
   Trace trace("DesktopKitImpl::bind");
   KitImpl::bind(context);
-  CORBA::Object_var object = context->get_singleton("IDL:fresco.org/Fresco/Desktop:1.0");
+  CORBA::Object_var object =
+      context->get_singleton("IDL:fresco.org/Fresco/Desktop:1.0");
   _desktop = Desktop::_narrow(object);
   _desktop->increment();
   Fresco::Kit::PropertySeq props;
   props.length(0);
-  _layout  = resolve_kit<LayoutKit>(context, "IDL:fresco.org/Fresco/LayoutKit:1.0", props);
-  _tool    = resolve_kit<ToolKit>(context, "IDL:fresco.org/Fresco/ToolKit:1.0", props);
-  _widget  = resolve_kit<WidgetKit>(context, "IDL:fresco.org/Fresco/WidgetKit:1.0", props);
-  _text    = resolve_kit<TextKit>(context, "IDL:fresco.org/Fresco/TextKit:1.0", props);
-  _image   = resolve_kit<ImageKit>(context, "IDL:fresco.org/Fresco/ImageKit:1.0", props);
-  _figure  = resolve_kit<FigureKit>(context, "IDL:fresco.org/Fresco/FigureKit:1.0", props);
+  _layout  = resolve_kit<LayoutKit>(context,
+				    "IDL:fresco.org/Fresco/LayoutKit:1.0",
+				    props);
+  _tool    = resolve_kit<ToolKit>(context,
+				  "IDL:fresco.org/Fresco/ToolKit:1.0",
+				  props);
+  _widget  = resolve_kit<WidgetKit>(context,
+				    "IDL:fresco.org/Fresco/WidgetKit:1.0",
+				    props);
+  _text    = resolve_kit<TextKit>(context,
+				  "IDL:fresco.org/Fresco/TextKit:1.0",
+				  props);
+  _image   = resolve_kit<ImageKit>(context,
+				   "IDL:fresco.org/Fresco/ImageKit:1.0",
+				   props);
+  _figure  = resolve_kit<FigureKit>(context,
+				    "IDL:fresco.org/Fresco/FigureKit:1.0",
+				    props);
 
   ClientContext_var client = context->client();
   _exit = client->exit();
 }
 
+
 Desktop_ptr DesktopKitImpl::desk()
 {
   return RefCount_var<Fresco::Desktop>::increment(_desktop);
@@ -73,7 +89,6 @@
 
 Window_ptr DesktopKitImpl::shell(Controller_ptr g, Fresco::ClientContext_ptr n)
 {
-  Trace trace("DesktopKitImpl::shell");
   WindowImpl *window = new WindowImpl;
   activate(window);
   Window_var wptr = window->_this();
@@ -186,7 +201,6 @@
 
 Window_ptr DesktopKitImpl::transient(Controller_ptr g)
 {
-  Trace trace("DesktopKitImpl::transient");
   WindowImpl *window = new WindowImpl();
   activate(window);
   Window_var wptr = window->_this();
@@ -269,7 +283,6 @@
 
 Window_ptr DesktopKitImpl::pulldown(Controller_ptr g)
 {
-  Trace trace("DesktopKitImpl::pulldown");
   Pulldown *menu = new Pulldown();
   activate(menu);
   Window_var wptr = menu->_this();
@@ -299,9 +312,13 @@
   return manipulator->_this();
 }
 
-Command_ptr DesktopKitImpl::move_resize(Fresco::Window_ptr window, Fresco::Alignment x, Fresco::Alignment y, CORBA::Short border)
+Command_ptr DesktopKitImpl::move_resize(Fresco::Window_ptr window,
+					Fresco::Alignment x,
+					Fresco::Alignment y,
+					CORBA::Short border)
 {
-  Manipulator *manipulator = new MoveResizer(window, _desktop, x, y, border);
+  Manipulator *manipulator =
+      new MoveResizer(window, _desktop, x, y, border);
   activate(manipulator);
   return manipulator->_this();
 }
@@ -313,7 +330,8 @@
   return manipulator->_this();
 }
 
-Command_ptr DesktopKitImpl::map(Fresco::Window_ptr window, CORBA::Boolean flag)
+Command_ptr DesktopKitImpl::map(Fresco::Window_ptr window,
+				CORBA::Boolean flag)
 {
   Manipulator *manipulator;
   if (flag) manipulator = new Mapper(window);
@@ -321,6 +339,8 @@
   activate(manipulator);
   return manipulator->_this();
 }
+
+
 
 extern "C" KitImpl *load()
 {

Index: WindowImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Desktop/WindowImpl.cc,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- WindowImpl.cc	5 Jan 2003 16:21:29 -0000	1.38
+++ WindowImpl.cc	23 Jan 2003 22:31:03 -0000	1.39
@@ -208,7 +208,7 @@
       StageHandle_var tmp = stage->insert(Graphic_var(_this()),
 					  _handle->position(),
 					  _handle->size(),
-					  _handle->layer()); 
+					  _handle->layer());
       stage->unlock();
       _handle = tmp;
       _unmapped = 0;