[Fresco-changes] Fresco/Fresco-C++-demos/src Application.cc,1.35,1.36 canvas.cc,1.9,1.10 pinyin_demo.cc,1.15,1.16

[Neil John Pilgrim]

Update of /cvs/fresco/Fresco/Fresco-C++-demos/src
In directory purcel:/tmp/cvs-serv21066/Fresco-C++-demos/src

Modified Files:
	Application.cc canvas.cc pinyin_demo.cc 
Log Message:
Fix for task54: add resolve_kit wrappers which do not require the repo-id 
strings for core kits, using a template traits technique.


Index: Application.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/src/Application.cc,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Application.cc	18 Feb 2003 21:18:14 -0000	1.35
+++ Application.cc	11 Apr 2003 00:09:35 -0000	1.36
@@ -81,15 +81,15 @@
 Application::Application(ServerContext_ptr sc, ClientContext_ptr cc)
   : _server(ServerContext::_duplicate(sc)),
     _client(ClientContext::_duplicate(cc)),
-    _tk(::resolve_kit<TextKit>(_server, "IDL:fresco.org/Fresco/TextKit:1.0")),
-    _dk(::resolve_kit<DesktopKit>(_server, "IDL:fresco.org/Fresco/DesktopKit:1.0")),
-    _lk(::resolve_kit<LayoutKit>(_server, "IDL:fresco.org/Fresco/LayoutKit:1.0")),
-    _ttk(::resolve_kit<ToolKit>(_server, "IDL:fresco.org/Fresco/ToolKit:1.0")),
-    _wk(::resolve_kit<WidgetKit>(_server, "IDL:fresco.org/Fresco/WidgetKit:1.0")),
-    _fk(::resolve_kit<FigureKit>(_server, "IDL:fresco.org/Fresco/FigureKit:1.0")),
-    _ck(::resolve_kit<CommandKit>(_server, "IDL:fresco.org/Fresco/CommandKit:1.0")),
-    _rk(::resolve_kit<RasterKit>(_server, "IDL:fresco.org/Fresco/RasterKit:1.0")),
-    _gk(::resolve_kit<GadgetKit>(_server, "IDL:fresco.org/Fresco/GadgetKit:1.0")),
+    _tk(::resolve_kit<TextKit>(_server)),
+    _dk(::resolve_kit<DesktopKit>(_server)),
+    _lk(::resolve_kit<LayoutKit>(_server)),
+    _ttk(::resolve_kit<ToolKit>(_server)),
+    _wk(::resolve_kit<WidgetKit>(_server)),
+    _fk(::resolve_kit<FigureKit>(_server)),
+    _ck(::resolve_kit<CommandKit>(_server)),
+    _rk(::resolve_kit<RasterKit>(_server)),
+    _gk(::resolve_kit<GadgetKit>(_server)),
     _vbox(_lk->vbox()),
     _choice(_wk->toggle_choice()),
     _mapper(new Mapper(_demos, Selection_var(_choice->state())))

Index: canvas.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/src/canvas.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- canvas.cc	1 Nov 2002 02:54:36 -0000	1.9
+++ canvas.cc	11 Apr 2003 00:09:35 -0000	1.10
@@ -77,8 +77,8 @@
   Server_var s = resolve_server(argc, argv, orb);
   ServerContext_var server = s->create_server_context(ClientContext_var(client->_this()));
 
-  DesktopKit_var desktop = resolve_kit<DesktopKit>(server, "IDL:fresco.org/Fresco/DesktopKit:1.0");
-  ToolKit_var tool = resolve_kit<ToolKit>(server, "IDL:fresco.org/Fresco/ToolKit:1.0");
+  DesktopKit_var desktop = resolve_kit<DesktopKit>(server);
+  ToolKit_var tool = resolve_kit<ToolKit>(server);
   Canvas_var canvas = tool->create_canvas(256, 256);
 
   Window_var window = desktop->shell(Controller_var(tool->group(canvas)),

Index: pinyin_demo.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Fresco-C++-demos/src/pinyin_demo.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pinyin_demo.cc	6 Nov 2002 05:44:14 -0000	1.15
+++ pinyin_demo.cc	11 Apr 2003 00:09:35 -0000	1.16
@@ -183,12 +183,12 @@
 
 	// Get Kits:
 
-    Fresco::LayoutKit_var lk = resolve_kit<Fresco::LayoutKit>(server, "IDL:fresco.org/Fresco/LayoutKit:1.0");
-    Fresco::TextKit_var tk = resolve_kit<Fresco::TextKit>(server, "IDL:fresco.org/Fresco/TextKit:1.0");
-    Fresco::ToolKit_var tlk = resolve_kit<Fresco::ToolKit>(server, "IDL:fresco.org/Fresco/ToolKit:1.0");
-    Fresco::DesktopKit_var dk = resolve_kit<Fresco::DesktopKit>(server, "IDL:fresco.org/Fresco/DesktopKit:1.0");
-    Fresco::CommandKit_var ck = resolve_kit<Fresco::CommandKit>(server, "IDL:fresco.org/Fresco/CommandKit:1.0");
-    Fresco::WidgetKit_var wk = resolve_kit<Fresco::WidgetKit>(server, "IDL:fresco.org/Fresco/WidgetKit:1.0");
+    Fresco::LayoutKit_var lk = resolve_kit<Fresco::LayoutKit>(server);
+    Fresco::TextKit_var tk = resolve_kit<Fresco::TextKit>(server);
+    Fresco::ToolKit_var tlk = resolve_kit<Fresco::ToolKit>(server);
+    Fresco::DesktopKit_var dk = resolve_kit<Fresco::DesktopKit>(server);
+    Fresco::CommandKit_var ck = resolve_kit<Fresco::CommandKit>(server);
+    Fresco::WidgetKit_var wk = resolve_kit<Fresco::WidgetKit>(server);
 
 	// Create the GUI: