1.1 --- a/ornamentedobj.cpp	Wed May 31 12:27:39 2006 +0000
     1.2 +++ b/ornamentedobj.cpp	Tue Sep 05 15:05:18 2006 +0000
     1.3 @@ -18,7 +18,7 @@
     1.4      init ();
     1.5  }
     1.6  
     1.7 -OrnamentedObj::OrnamentedObj(QCanvas* c) :LinkableMapObj(c)
     1.8 +OrnamentedObj::OrnamentedObj(Q3Canvas* c) :LinkableMapObj(c)
     1.9  {
    1.10  //    cout << "Const OrnamentedObj\n";
    1.11      init ();
    1.12 @@ -159,8 +159,7 @@
    1.13  
    1.14  void OrnamentedObj::move2RelPos(double x, double y)
    1.15  {
    1.16 -	if (!parObj) return;
    1.17 -	move (parObj->getChildPos().x()+x, parObj->getChildPos().y()+y);
    1.18 +	setRelPos (QPoint(x,y));
    1.19  }
    1.20  
    1.21  void OrnamentedObj::move2RelPos(QPoint p)
    1.22 @@ -281,6 +280,15 @@
    1.23  	forceReposition();
    1.24  }
    1.25  
    1.26 +void OrnamentedObj::deactivateStandardFlag(QString f)
    1.27 +{
    1.28 +	standardFlags->deactivate(f);
    1.29 +	calcBBoxSize();
    1.30 +	positionBBox();
    1.31 +	move (absPos.x(), absPos.y() );
    1.32 +	forceReposition();
    1.33 +}
    1.34 +
    1.35  bool OrnamentedObj::isSetStandardFlag (QString f)
    1.36  {
    1.37  	return standardFlags->isActive(f);
    1.38 @@ -312,6 +320,11 @@
    1.39  	}	
    1.40  }
    1.41  
    1.42 +void OrnamentedObj::updateFlagsToolbar()
    1.43 +{
    1.44 +	standardFlags->updateToolbar();
    1.45 +}
    1.46 +
    1.47  void OrnamentedObj::setHideInExport(bool b)
    1.48  {
    1.49  	if (parObj)