diff -r 0f8879937035 -r a551ed6005cc ornamentedobj.cpp
--- a/ornamentedobj.cpp	Wed Apr 25 16:02:54 2007 +0000
+++ b/ornamentedobj.cpp	Wed Apr 25 16:02:54 2007 +0000
@@ -106,18 +106,23 @@
     return heading->getColor();
 }
 
-FrameType OrnamentedObj::getFrameType()
+FrameObj::FrameType OrnamentedObj::getFrameType()
 {
 	return frame->getFrameType();
 }
 
-void OrnamentedObj::setFrameType(const FrameType &t)
+QString OrnamentedObj::getFrameTypeName()
+{
+	return frame->getFrameTypeName();
+}
+
+void OrnamentedObj::setFrameType(const FrameObj::FrameType &t)
 {
 	frame->setFrameType(t);
-	if (t == NoFrame)
-		linkpos=LinkBottom;
+	if (t == FrameObj::NoFrame)
+		linkpos=LinkableMapObj::Bottom;
 	else	
-		linkpos=LinkMiddle;
+		linkpos=LinkableMapObj::Middle;
 
 	calcBBoxSize();
 	positionBBox();
@@ -127,16 +132,42 @@
 void OrnamentedObj::setFrameType(const QString &t)
 {
 	frame->setFrameType(t);
-	if (frame->getFrameType() == NoFrame)
-		linkpos=LinkBottom;
+	if (frame->getFrameType() == FrameObj::NoFrame)
+		linkpos=LinkableMapObj::Bottom;
 	else	
-		linkpos=LinkMiddle;
+		linkpos=LinkableMapObj::Middle;
 
 	calcBBoxSize();
 	positionBBox();
 	requestReposition();
 }
 
+void OrnamentedObj::setFramePadding (const int &i)
+{
+	frame->setPadding (i);
+	calcBBoxSize();
+	positionBBox();
+	requestReposition();
+}
+
+int OrnamentedObj::getFramePadding ()
+{
+	return frame->getPadding();
+}
+
+void OrnamentedObj::setFrameBorderWidth (const int &i)
+{
+	frame->setBorderWidth(i);
+	calcBBoxSize();
+	positionBBox();
+	requestReposition();
+}
+
+int OrnamentedObj::getFrameBorderWidth()
+{
+	return frame->getBorderWidth();
+}
+
 void OrnamentedObj::setFramePenColor(QColor col)
 {
 	frame->setPenColor (col);
@@ -159,7 +190,7 @@
 
 void OrnamentedObj::positionContents()
 {
-	double d=frame->getBorder()/2;
+	double d=frame->getPadding()/2;
 	double x=absPos.x();
 	double y=absPos.y();