Pre-resize fillparent

TrooperEngineTest/EventEngineTest/EventEngineTest.cpp

@@ -7,7 +7,7 @@
 
 void EventEngineTest()
 {
-	// cString
+	/// cString
 	printf("\nTesting cString -----\n\n");
 
 	UTest u("cString");

TrooperEngineTest/EventEngineTest/EventEngineTest.hpp

@@ -3,4 +3,4 @@
 
 void EventEngineTest();
 
-#endif //__EVENTENGINETEST__
+#endif ///__EVENTENGINETEST__

TrooperEngineTest/GUIEngineTest/GUIXMLTest.cpp

@@ -316,8 +316,6 @@ void GUIXMLBoxSizerTest()
 	u.report();
 
 	GUIEngine::cGUI::Inst().Delete();
-
-
 }
 
 void LoadFile( const cString& filename, const bool show /*= false*/ )

TrooperEngineTest/GUIEngineTest/GUIXMLTest.hpp

@@ -34,4 +34,4 @@ void cWindowTest( const cString& msg, UTest& u, GUIEngine::cWindow* win, const S
 void cWindowTest( const cString& msg, UTest& u, GUIEngine::cWindow* win, const GUIHelpers::Position& pos,
 	const GUIHelpers::Size& size, const GUIHelpers::Padding& pad, const GUIHelpers::Position& center );
 
-#endif // __GUIXMLTEST__
+#endif /// __GUIXMLTEST__

TrooperEngineTest/TrooperEngineTest.vcxproj

@@ -150,6 +150,7 @@
     <ClCompile Include="main.cpp" />
     <ClCompile Include="UTest\UTest.cpp" />
     <ClCompile Include="UtilityEngineTest\StringTest.cpp" />
+    <ClCompile Include="UtilityEngineTest\UtilityEngineTest.cpp" />
     <ClCompile Include="VideoEngineTest\ImageFileTest.cpp" />
     <ClCompile Include="VideoEngineTest\RendererTest.cpp" />
     <ClCompile Include="VideoEngineTest\VideoEngineTest.cpp" />
@@ -160,6 +161,7 @@
     <ClInclude Include="GUIEngineTest\GUIXMLTest.hpp" />
     <ClInclude Include="UTest\UTest.hpp" />
     <ClInclude Include="UtilityEngineTest\StringTest.hpp" />
+    <ClInclude Include="UtilityEngineTest\UtilityEngineTest.hpp" />
     <ClInclude Include="VideoEngineTest\ImageFileTest.hpp" />
     <ClInclude Include="VideoEngineTest\RendererTest.hpp" />
     <ClInclude Include="VideoEngineTest\VideoEngineTest.hpp" />

TrooperEngineTest/TrooperEngineTest.vcxproj.filters

@@ -45,6 +45,9 @@
     <ClInclude Include="VideoEngineTest\VideoEngineTest.hpp">
       <Filter>VideoEngineTest</Filter>
     </ClInclude>
+    <ClInclude Include="UtilityEngineTest\UtilityEngineTest.hpp">
+      <Filter>UtitlityEngineTest</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="UTest\UTest.cpp">
@@ -72,6 +75,9 @@
     <ClCompile Include="VideoEngineTest\VideoEngineTest.cpp">
       <Filter>VideoEngineTest</Filter>
     </ClCompile>
+    <ClCompile Include="UtilityEngineTest\UtilityEngineTest.cpp">
+      <Filter>UtitlityEngineTest</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="xml\GUI.xml">

TrooperEngineTest/UtilityEngineTest/StringTest.cpp

@@ -9,7 +9,7 @@ using UtilityEngine::cString;
 
 void StringTest() 
 {
-	// cString
+	/// cString
 	printf("\nTesting cString -----\n\n");
 
 	UTest u("cString");

TrooperEngineTest/UtilityEngineTest/StringTest.hpp

@@ -3,4 +3,4 @@
 
 void StringTest();
 
-#endif // __STRINGTEST__
+#endif /// __STRINGTEST__

TrooperEngineTest/UtilityEngineTest/UtilityEngineTest.cpp

@@ -0,0 +1,8 @@
+#include "UtilityEngineTest.hpp"
+
+#include "StringTest.hpp"
+
+void UtilityEngineTest()
+{
+	StringTest();
+}

TrooperEngineTest/UtilityEngineTest/UtilityEngineTest.hpp

@@ -0,0 +1,6 @@
+#ifndef __UTILITYENGINETEST__
+#define __UTILITYENGINETEST__
+
+void UtilityEngineTest();
+
+#endif /// __UTILITYENGINETEST__

TrooperEngineTest/VideoEngineTest/ImageFileTest.cpp

@@ -11,7 +11,7 @@ using VideoEngine::cSprite;
 
 void ImageFileTest()
 {
-	// cImageFile
+	/// cImageFile
 	printf("\nTesting cImageFile -----\n\n");
 
 	UTest u("cImageFile");

TrooperEngineTest/VideoEngineTest/ImageFileTest.hpp

@@ -3,4 +3,4 @@
 
 void ImageFileTest();
 
-#endif // __IMAGEFILETEST__
+#endif /// __IMAGEFILETEST__

TrooperEngineTest/VideoEngineTest/RendererTest.cpp

@@ -23,7 +23,7 @@ void RendererTest()
 
 
 
-	//u.test("Screen Shot", RendererTextureToSurface());
+	///u.test("Screen Shot", RendererTextureToSurface());
 	
 
 	u.report();

TrooperEngineTest/VideoEngineTest/RendererTest.hpp

@@ -9,4 +9,4 @@ const bool RendererAreaEqualNotEqual();
 
 const bool RendererTextureToSurface();
 
-#endif // __RENDERERTEST__
+#endif /// __RENDERERTEST__

TrooperEngineTest/VideoEngineTest/VideoEngineTest.hpp

@@ -3,4 +3,4 @@
 
 void VideoEngineTest();
 
-#endif // __VIDEOENGINETEST__
+#endif /// __VIDEOENGINETEST__

TrooperEngineTest/VideoEngineTest/VideoTest.cpp

@@ -9,7 +9,7 @@ using VideoEngine::cVideo;
 
 void VideoTest()
 {
-	// cVideo
+	/// cVideo
 	printf("\nTesting cVideo -----\n\n");
 
 	UTest u("cVideo");
@@ -22,7 +22,7 @@ void VideoTest()
 
 	u.test("Video Setup. Setup()", video.Setup());
 
-	//	CaptionTest
+	///	CaptionTest
 	u.test("setCaption() and getCaption()", CaptionTest());
 	
 	u.report();

TrooperEngineTest/VideoEngineTest/VideoTest.hpp

@@ -5,4 +5,4 @@ void VideoTest();
 
 const bool CaptionTest();
 
-#endif // __VIDEOTEST__
+#endif /// __VIDEOTEST__

TrooperEngineTest/main.cpp

@@ -26,7 +26,7 @@ see license.txt for details
 #include "VideoEngineTest/VideoEngineTest.hpp"
 
 /*** Utility Engine Test ***/
-#include "UtilityEngineTest/StringTest.hpp"
+#include "UtilityEngineTest/UtilityEngineTest.hpp"
 
 /*** GUI Engine Test ***/
 #include "GUIEngineTest/GUIXMLTest.hpp"
@@ -47,12 +47,12 @@ int main(int argc, char *argv[])
 	
 	VideoEngineTest();
 
-	//UtilityEngineTest();
+	UtilityEngineTest();
 		
 
-	//StringTest();
+	
 
-	//GUIXMLTest();
+	GUIXMLTest();
 
 	//ImageTest();
 

TrooperEngineTest/xml/GUIXMLBoxSizerTest.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Panel size="200,200">
-  <debug/>
+  <debug />
   <Layout>
     <Boxsizer />
     <Label text="Box Sizer" />
+    <Boxsizer />
   </Layout>
 </Panel>

TrooperEngineTest/xml/GUIXMLDefaultTest.xml

@@ -3,5 +3,6 @@
   <debug/>
   <Layout>
     <Label text="Hello world" />
+    <Include dir ="xml/" filename="include.xml"/>
   </Layout>
 </Panel>

TrooperEngineTest/xml/include.xml

@@ -1,8 +1,3 @@
 <?xml version="1.0"?>
-<Layout layout="wrap_content">
-  <Label
-	  text="Hello World2"
-		padding=""/>
-  <Label
-	  text="Richard Allen2"/>
-</Layout>
+<Boxsizer />
+<Label text="Box Sizer" />