[Csp-commits] svn:csp r2062 - trunk/csp/cspsim/wf

[<sv...@ww...>]

Author: nsmoooose
Date: 2007-03-11 11:41:29 -0700 (Sun, 11 Mar 2007)
New Revision: 2062

Modified:
   trunk/csp/cspsim/wf/ControlGeometryBuilder.h
   trunk/csp/cspsim/wf/Window.h
Log:
Fixed some compilation errors on linux.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2062

Modified: trunk/csp/cspsim/wf/ControlGeometryBuilder.h
===================================================================
--- trunk/csp/cspsim/wf/ControlGeometryBuilder.h	2007-03-11 18:30:28 UTC (rev 2061)
+++ trunk/csp/cspsim/wf/ControlGeometryBuilder.h	2007-03-11 18:41:29 UTC (rev 2062)
@@ -87,9 +87,6 @@
 	virtual osg::Geometry* buildTriangle(
 		const Point& p1, const Point& p2, const Point& p3, float z,
 		const osg::Vec4& c1, const osg::Vec4& c2, const osg::Vec4& c3) const;
-
-protected:
-	std::string m_Text;
 };
 
 } // namespace wf

Modified: trunk/csp/cspsim/wf/Window.h
===================================================================
--- trunk/csp/cspsim/wf/Window.h	2007-03-11 18:30:28 UTC (rev 2061)
+++ trunk/csp/cspsim/wf/Window.h	2007-03-11 18:41:29 UTC (rev 2062)
@@ -46,8 +46,6 @@
 
 class Window : public SingleControlContainer {
 public:
-	friend WindowManager;
-	
 	Window();
 	virtual ~Window();