Fresco/Berlin/modules/Unidraw UnidrawKitImpl.cc,1.10,1.11 UnidrawKitImpl.hh,1.7,1.8 ViewImpl.cc,1.5,1.6
Stefan Seefeld <[email protected]>
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Berlin/modules/Unidraw
In directory purcel:/tmp/cvs-serv31700/Berlin/modules/Unidraw
Modified Files:
UnidrawKitImpl.cc UnidrawKitImpl.hh ViewImpl.cc
Log Message:
a somewhat lengthy fix for http://issues.fresco.org/bug92
Index: UnidrawKitImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Unidraw/UnidrawKitImpl.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- UnidrawKitImpl.cc 25 Jan 2003 22:37:04 -0000 1.10
+++ UnidrawKitImpl.cc 18 Feb 2003 07:26:37 -0000 1.11
@@ -33,8 +33,9 @@
using namespace Berlin::UnidrawKit;
UnidrawKitImpl::UnidrawKitImpl(const std::string &id,
- const Fresco::Kit::PropertySeq &p)
- : KitImpl(id, p)
+ const Fresco::Kit::PropertySeq &p,
+ ServerContextImpl *c)
+ : KitImpl(id, p, c)
{ }
UnidrawKitImpl::~UnidrawKitImpl()
@@ -93,5 +94,5 @@
extern "C" KitImpl *load()
{
static std::string properties[] = {"implementation", "UnidrawKitImpl"};
- return create_kit<UnidrawKitImpl>("IDL:fresco.org/Unidraw/UnidrawKit:1.0", properties, 2);
+ return create_prototype<UnidrawKitImpl>("IDL:fresco.org/Unidraw/UnidrawKit:1.0", properties, 2);
}
Index: UnidrawKitImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Unidraw/UnidrawKitImpl.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- UnidrawKitImpl.hh 5 Jan 2003 16:21:35 -0000 1.7
+++ UnidrawKitImpl.hh 18 Feb 2003 07:26:37 -0000 1.8
@@ -30,16 +30,21 @@
#include <Berlin/KitImpl.hh>
#include <Berlin/RefCountVar.hh>
-namespace Berlin {
-namespace UnidrawKit {
+namespace Berlin
+{
+namespace UnidrawKit
+{
class UnidrawKitImpl : public virtual POA_Unidraw::UnidrawKit,
public KitImpl
{
public:
- UnidrawKitImpl(const std::string &, const Fresco::Kit::PropertySeq &);
+ UnidrawKitImpl(const std::string &,
+ const Fresco::Kit::PropertySeq &,
+ ServerContextImpl *);
virtual ~UnidrawKitImpl();
- virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p) { return new UnidrawKitImpl(repo_id(), p);}
+ virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p, ServerContextImpl *c)
+ { return new UnidrawKitImpl(repo_id(), p, c);}
virtual void bind(Fresco::ServerContext_ptr);
virtual Unidraw::Tool_ptr select_tool();
virtual Unidraw::Editor_ptr create_editor();
Index: ViewImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Unidraw/ViewImpl.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ViewImpl.cc 5 Jan 2003 16:21:35 -0000 1.5
+++ ViewImpl.cc 18 Feb 2003 07:26:37 -0000 1.6
@@ -57,6 +57,5 @@
Unidraw::Model_ptr UViewImpl::subject() { return Unidraw::Model::_duplicate(_model);}
CORBA::Boolean UViewImpl::handle_positional(PickTraversal_ptr traversal, const Input::Event &event)
{
- std::cout << "handle_positional" << std::endl;
return false;
}