Fresco/Berlin/modules/Drawing/libArt DrawingKit.cc,1.48,1.49 DrawingKit.hh,1.29,1.30
Stefan Seefeld <[email protected]>
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Berlin/modules/Drawing/libArt
In directory purcel:/tmp/cvs-serv31700/Berlin/modules/Drawing/libArt
Modified Files:
DrawingKit.cc DrawingKit.hh
Log Message:
a somewhat lengthy fix for http://issues.fresco.org/bug92
Index: DrawingKit.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Drawing/libArt/DrawingKit.cc,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- DrawingKit.cc 5 Jan 2003 16:21:30 -0000 1.48
+++ DrawingKit.cc 18 Feb 2003 07:26:27 -0000 1.49
@@ -49,8 +49,9 @@
libArt::DrawingKit::~DrawingKit() {}
libArt::DrawingKit::DrawingKit(const std::string &id,
- const Fresco::Kit::PropertySeq &p)
- : KitImpl(id, p),
+ const Fresco::Kit::PropertySeq &p,
+ ServerContextImpl *c)
+ : KitImpl(id, p, c),
_drawable(0),
_xres(1.),
_yres(1.),
@@ -64,9 +65,10 @@
_fg.red = 1.0; _fg.green = 1.0; _fg.blue = 1.0; _fg.alpha = 1.0;
}
-KitImpl *libArt::DrawingKit::clone(const Fresco::Kit::PropertySeq &p)
+KitImpl *libArt::DrawingKit::clone(const Fresco::Kit::PropertySeq &p,
+ ServerContextImpl *c)
{
- libArt::DrawingKit *kit = new libArt::DrawingKit(repo_id(), p);
+ libArt::DrawingKit *kit = new libArt::DrawingKit(repo_id(), p, c);
kit->init();
return kit;
}
@@ -558,5 +560,5 @@
extern "C" KitImpl *load()
{
static std::string properties[] = {"implementation", "LibArtDrawingKit"};
- return create_kit<libArt::DrawingKit>("IDL:fresco.org/Fresco/DrawingKit:1.0", properties, 2);
+ return create_prototype<libArt::DrawingKit>("IDL:fresco.org/Fresco/DrawingKit:1.0", properties, 2);
}
Index: DrawingKit.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Drawing/libArt/DrawingKit.hh,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- DrawingKit.hh 5 Jan 2003 16:21:30 -0000 1.29
+++ DrawingKit.hh 18 Feb 2003 07:26:28 -0000 1.30
@@ -46,16 +46,21 @@
#include <string>
#include <vector>
-namespace Berlin {
-namespace DrawingKit {
-namespace libArt {
+namespace Berlin
+{
+namespace DrawingKit
+{
+namespace libArt
+{
class DrawingKit : public DrawingKitBase, public KitImpl
{
public:
- DrawingKit(const std::string &, const Fresco::Kit::PropertySeq &);
+ DrawingKit(const std::string &,
+ const Fresco::Kit::PropertySeq &,
+ ServerContextImpl *);
virtual ~DrawingKit();
- virtual KitImpl *clone(const Fresco::Kit::PropertySeq &);
+ virtual KitImpl *clone(const Fresco::Kit::PropertySeq &, ServerContextImpl *);
virtual void transformation(Fresco::Transform_ptr t) { DrawingKitBase::transformation(t);}
virtual Fresco::Transform_ptr transformation() { return Fresco::Transform::_duplicate(_tr);}