Fresco/Berlin/modules/Widgets/Motif WidgetKit.cc,1.33,1.34 WidgetKit.hh,1.17,1.18
Stefan Seefeld <[email protected]>
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Berlin/modules/Widgets/Motif
In directory purcel:/tmp/cvs-serv31700/Berlin/modules/Widgets/Motif
Modified Files:
WidgetKit.cc WidgetKit.hh
Log Message:
a somewhat lengthy fix for http://issues.fresco.org/bug92
Index: WidgetKit.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Widgets/Motif/WidgetKit.cc,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- WidgetKit.cc 25 Jan 2003 22:37:04 -0000 1.33
+++ WidgetKit.cc 18 Feb 2003 07:26:38 -0000 1.34
@@ -45,9 +45,12 @@
using namespace Berlin::WidgetKit;
-namespace Berlin {
-namespace WidgetKit {
-namespace Motif {
+namespace Berlin
+{
+namespace WidgetKit
+{
+namespace Motif
+{
class Forward : public CommandImpl
{
@@ -80,8 +83,9 @@
// };
WidgetKit::WidgetKit(const std::string &id,
- const Fresco::Kit::PropertySeq &p)
- : KitImpl(id, p)
+ const Fresco::Kit::PropertySeq &p,
+ ServerContextImpl *c)
+ : KitImpl(id, p, c)
{ }
WidgetKit::~WidgetKit() { }
@@ -464,5 +468,5 @@
extern "C" KitImpl *load()
{
static std::string properties[] = {"implementation", "Motif::WidgetKit", "style", "Motif"};
- return create_kit<Berlin::WidgetKit::Motif::WidgetKit> ("IDL:fresco.org/Fresco/WidgetKit:1.0", properties, 4);
+ return create_prototype<Berlin::WidgetKit::Motif::WidgetKit> ("IDL:fresco.org/Fresco/WidgetKit:1.0", properties, 4);
}
Index: WidgetKit.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Widgets/Motif/WidgetKit.hh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- WidgetKit.hh 5 Jan 2003 16:21:36 -0000 1.17
+++ WidgetKit.hh 18 Feb 2003 07:26:38 -0000 1.18
@@ -35,17 +35,23 @@
class GraphicImpl;
-namespace Berlin {
-namespace WidgetKit {
-namespace Motif {
+namespace Berlin
+{
+namespace WidgetKit
+{
+namespace Motif
+{
class WidgetKit : public virtual POA_Fresco::WidgetKit,
public KitImpl
{
public:
- WidgetKit(const std::string &, const Fresco::Kit::PropertySeq &);
+ WidgetKit(const std::string &,
+ const Fresco::Kit::PropertySeq &,
+ ServerContextImpl *);
virtual ~WidgetKit();
- virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p) { return new WidgetKit(repo_id(), p);}
+ virtual KitImpl *clone(const Fresco::Kit::PropertySeq &p, ServerContextImpl *c)
+ { return new WidgetKit(repo_id(), p, c);}
virtual void bind(Fresco::ServerContext_ptr);
Fresco::Trigger_ptr button(Fresco::Graphic_ptr, Fresco::Command_ptr);