[Csp-commits] svn:csp r2012 - in trunk/csp/cspsim/wf: . themes

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

Author: mkrose
Date: 2006-11-14 22:29:00 -0800 (Tue, 14 Nov 2006)
New Revision: 2012

Modified:
   trunk/csp/cspsim/wf/Button.cpp
   trunk/csp/cspsim/wf/Theme.h
   trunk/csp/cspsim/wf/themes/Default.cpp
   trunk/csp/cspsim/wf/themes/Default.h
Log:
Fix minor compile errors and warnings.

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

Modified: trunk/csp/cspsim/wf/Button.cpp
===================================================================
--- trunk/csp/cspsim/wf/Button.cpp	2006-11-14 23:00:06 UTC (rev 2011)
+++ trunk/csp/cspsim/wf/Button.cpp	2006-11-15 06:29:00 UTC (rev 2012)
@@ -44,8 +44,8 @@
 	}
 	
 private:
+	ButtonClickedSignal& m_ButtonClicked;
 	Button* m_Button;
-	ButtonClickedSignal& m_ButtonClicked;
 };
 
 Button::Button(Theme* theme) : SingleControlContainer(theme), m_ChildControl(new Label(theme)) {

Modified: trunk/csp/cspsim/wf/Theme.h
===================================================================
--- trunk/csp/cspsim/wf/Theme.h	2006-11-14 23:00:06 UTC (rev 2011)
+++ trunk/csp/cspsim/wf/Theme.h	2006-11-15 06:29:00 UTC (rev 2012)
@@ -75,7 +75,7 @@
 		const Button& button	// The button to generate geometry for.
 		)=0;
 	*/
-	virtual ~Theme()=0{};	
+	virtual ~Theme() {}
 };
 
 } // namespace wf

Modified: trunk/csp/cspsim/wf/themes/Default.cpp
===================================================================
--- trunk/csp/cspsim/wf/themes/Default.cpp	2006-11-14 23:00:06 UTC (rev 2011)
+++ trunk/csp/cspsim/wf/themes/Default.cpp	2006-11-15 06:29:00 UTC (rev 2012)
@@ -270,7 +270,7 @@
 	return group.release();
 }
 
-osg::Group* Default::buildTabPage(const TabPage* page) const {
+osg::Group* Default::buildTabPage(const TabPage* /*page*/) const {
 	return NULL;
 }
 
@@ -428,11 +428,11 @@
 	return Size(windowSize.m_W - getBorderWidth(), windowSize.m_H - getBorderWidth() - getCaptionHeight());
 }
 
-Point Default::getWindowClientAreaLocation(const Window* window) const {
+Point Default::getWindowClientAreaLocation(const Window* /*window*/) const {
 	return Point(0, 0 - (getCaptionHeight() / 2));
 }
 
-Size Default::getTabPageClientAreaSize(const Tab* tab) const {
+Size Default::getTabPageClientAreaSize(const Tab* /*tab*/) const {
 	Size tabSize = tab->getSize();
 	return Size(tabSize.m_W, tabSize.m_H - m_Colors.tabButtonHeight);
 }

Modified: trunk/csp/cspsim/wf/themes/Default.h
===================================================================
--- trunk/csp/cspsim/wf/themes/Default.h	2006-11-14 23:00:06 UTC (rev 2011)
+++ trunk/csp/cspsim/wf/themes/Default.h	2006-11-15 06:29:00 UTC (rev 2012)
@@ -38,13 +38,13 @@
 	Default();
 	virtual ~Default();
 
-	virtual osg::Geometry* Default::BuildRectangle(
+	virtual osg::Geometry* BuildRectangle(
 		float x1, float y1, float x2, float y2, float z,
 		const osg::Vec4& c1, const osg::Vec4& c2, const osg::Vec4& c3, const osg::Vec4& c4) const;
 	
 	virtual float getBorderWidth() const;
 	virtual float getCaptionHeight() const;
-	virtual std::string Default::getCaptionFont() const;
+	virtual std::string getCaptionFont() const;
 
 	virtual osg::Group* buildLabel(const Label* label) const;
 	virtual osg::Group* buildButton(const Button* button) const;
@@ -73,7 +73,7 @@
 			
 			windowBackgroundColor(0.349f, 0.576f, 0.298f, 0.8f),
 			windowCaptionTextColor(1.0f, 1.0f, 1.0f, 1.0f),
-			windowCaptionBackgroundColor1(0.5f, 0.0f, 0.0f, 1.0f), 
+			windowCaptionBackgroundColor1(0.5f, 0.0f, 0.0f, 1.0f),
 			windowCaptionBackgroundColor2(0.1f, 0.0f, 0.0f, 0.4f),
 			windowCaptionBorderColor1(0.0f, 0.0f, 0.0f, 1.0f),
 			windowCaptionBorderColor2(0.0f, 0.0f, 0.0f, 0.0f),
@@ -115,9 +115,9 @@
 		
 	} m_Colors;
 
-	virtual osg::Geometry* Default::BuildRectangle(
+	virtual osg::Geometry* BuildRectangle(
 		float x1, float y1, float x2, float y2, float z, float lineWidth,
-		const osg::Vec4& outerColor, const osg::Vec4& innerColor, 
+		const osg::Vec4& outerColor, const osg::Vec4& innerColor,
 		bool left=true, bool top=true, bool right=true, bool bottom=true) const;
 
 protected: