frameobj.cpp
branchqt4-port
changeset 8 21379539d952
parent 0 7a96bd401351
     1.1 --- a/frameobj.cpp	Sun Jan 30 12:58:47 2005 +0000
     1.2 +++ b/frameobj.cpp	Wed Jul 05 10:29:54 2006 +0000
     1.3 @@ -11,7 +11,7 @@
     1.4      init ();
     1.5  }
     1.6  
     1.7 -FrameObj::FrameObj(QCanvas* c) :MapObj(c)
     1.8 +FrameObj::FrameObj(Q3Canvas* c) :MapObj(c)
     1.9  {
    1.10  //    cout << "Const FrameObj\n";
    1.11      init ();
    1.12 @@ -117,16 +117,13 @@
    1.13  				break;
    1.14  			case Rectangle:
    1.15  				border=10;
    1.16 -				rectFrame = new QCanvasRectangle (canvas);
    1.17 +				rectFrame = new Q3CanvasRectangle (canvas);
    1.18  				rectFrame->setZ(Z_FRAME);
    1.19  				rectFrame->setBrush( QColor("white") );
    1.20  				rectFrame->setPen( QPen(QColor("black") ));
    1.21 -				if (visible)
    1.22 -					rectFrame->show();
    1.23 -				else    
    1.24 -					rectFrame->hide();
    1.25  				break;
    1.26  		}
    1.27 +		setVisibility (visible);
    1.28  	}
    1.29  }
    1.30  
    1.31 @@ -141,6 +138,16 @@
    1.32  void FrameObj::setVisibility (bool v)
    1.33  {
    1.34      MapObj::setVisibility(v);
    1.35 -    setFrameType (type);    // changes on visibility depend on type...
    1.36 +	switch (type)
    1.37 +	{
    1.38 +		case NoFrame:
    1.39 +			break;
    1.40 +		case Rectangle:
    1.41 +			if (visible)
    1.42 +				rectFrame->show();
    1.43 +			else    
    1.44 +				rectFrame->hide();
    1.45 +			break;
    1.46 +	}
    1.47  }
    1.48