Fresco/Berlin/modules/Tools ToolKitImpl.cc,1.26,1.27 ToolKitImpl.hh,1.19,1.20
Stefan Seefeld <[email protected]>
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Berlin/modules/Tools
In directory purcel:/tmp/cvs-serv31700/Berlin/modules/Tools
Modified Files:
ToolKitImpl.cc ToolKitImpl.hh
Log Message:
a somewhat lengthy fix for http://issues.fresco.org/bug92
Index: ToolKitImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Tools/ToolKitImpl.cc,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ToolKitImpl.cc 25 Jan 2003 22:37:03 -0000 1.26
+++ ToolKitImpl.cc 18 Feb 2003 07:26:36 -0000 1.27
@@ -109,8 +109,9 @@
};
ToolKitImpl::ToolKitImpl(const std::string &id,
- const Fresco::Kit::PropertySeq &p)
- : KitImpl(id, p) {}
+ const Fresco::Kit::PropertySeq &p,
+ ServerContextImpl *c)
+ : KitImpl(id, p, c) {}
ToolKitImpl::~ToolKitImpl() { }
@@ -330,5 +331,5 @@
extern "C" KitImpl *load()
{
static std::string properties[] = {"implementation", "ToolKitImpl"};
- return create_kit<Berlin::ToolKit::ToolKitImpl> ("IDL:fresco.org/Fresco/ToolKit:1.0", properties, 2);
+ return create_prototype<Berlin::ToolKit::ToolKitImpl> ("IDL:fresco.org/Fresco/ToolKit:1.0", properties, 2);
}
Index: ToolKitImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Tools/ToolKitImpl.hh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ToolKitImpl.hh 23 Jan 2003 22:31:06 -0000 1.19
+++ ToolKitImpl.hh 18 Feb 2003 07:26:36 -0000 1.20
@@ -30,16 +30,21 @@
class GraphicImpl;
-namespace Berlin {
-namespace ToolKit {
+namespace Berlin
+{
+namespace ToolKit
+{
class ToolKitImpl : public virtual POA_Fresco::ToolKit,
public KitImpl
{
public:
- ToolKitImpl(const std::string &, const Fresco::Kit::PropertySeq &);
+ ToolKitImpl(const std::string &,
+ const Fresco::Kit::PropertySeq &,
+ ServerContextImpl *);
virtual ~ToolKitImpl();
- virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p) { return new ToolKitImpl(repo_id(), p);}
+ virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p, ServerContextImpl *c)
+ { return new ToolKitImpl(repo_id(), p, c);}
Fresco::Graphic_ptr debugger(Fresco::Graphic_ptr, const char *);
Fresco::DrawingState_ptr decorator(Fresco::Graphic_ptr);