diff -r 658ad3bc0c8a -r dfbc371b7280 ornamentedobj.cpp
--- a/ornamentedobj.cpp	Sat Mar 31 09:28:27 2007 +0000
+++ b/ornamentedobj.cpp	Sat Mar 31 09:28:27 2007 +0000
@@ -31,9 +31,10 @@
 
 OrnamentedObj::~OrnamentedObj()
 {
-    delete (heading);
-	delete (systemFlags);
-	delete (standardFlags);
+    delete heading;
+	delete systemFlags;
+	delete standardFlags;
+	delete frame;
 }
 
 
@@ -54,6 +55,8 @@
 	standardFlags->clone(standardFlagsDefault);
 	standardFlags->setName ("standardFlags");
 
+	frame = new FrameObj (scene);
+
 	hideExport=false;
 	hidden=false;
 
@@ -103,6 +106,56 @@
     return heading->getColor();
 }
 
+FrameType OrnamentedObj::getFrameType()
+{
+	return frame->getFrameType();
+}
+
+void OrnamentedObj::setFrameType(const FrameType &t)
+{
+	frame->setFrameType(t);
+	if (t == NoFrame)
+		linkpos=LinkBottom;
+	else	
+		linkpos=LinkMiddle;
+
+	calcBBoxSize();
+	positionBBox();
+	requestReposition();
+}
+
+void OrnamentedObj::setFrameType(const QString &t)
+{
+	frame->setFrameType(t);
+	if (frame->getFrameType() == NoFrame)
+		linkpos=LinkBottom;
+	else	
+		linkpos=LinkMiddle;
+
+	calcBBoxSize();
+	positionBBox();
+	requestReposition();
+}
+
+void OrnamentedObj::setFramePenColor(QColor col)
+{
+	frame->setPenColor (col);
+}
+
+QColor OrnamentedObj::getFramePenColor()
+{
+	return frame->getPenColor ();
+}
+
+void OrnamentedObj::setFrameBrushColor(QColor col)
+{
+	frame->setBrushColor (col);
+}
+
+QColor OrnamentedObj::getFrameBrushColor()
+{
+	return frame->getBrushColor ();
+}
 
 void OrnamentedObj::positionContents()
 {