new release 0.6.0.0

vczh · Dec 24, 2013 · 8404567 · 8404567
1 parent e36d665
commit 8404567
Show file tree

Hide file tree

Showing 1,666 changed files with 30,167 additions and 14,228 deletions.
diff --git a/GacUIDemo/Controls.DataGrid.ChemicalElements/Controls.DataGrid.ChemicalElements.vcxproj b/GacUIDemo/Controls.DataGrid.ChemicalElements/Controls.DataGrid.ChemicalElements.vcxproj
@@ -83,8 +83,8 @@
     <ClCompile Include="Main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\GacUIStaticLibrary\GacUIStaticLibrary.vcxproj">
-      <Project>{6698c71d-0d4e-4031-846a-8698f9c9d658}</Project>
+    <ProjectReference Include="..\GacUIReflectionStaticLibrary\GacUIReflectionStaticLibrary.vcxproj">
+      <Project>{8c242464-8009-4a8a-9443-abe406809c71}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/GacUIDemo/Controls.DataGrid.ChemicalElements/Main.cpp b/GacUIDemo/Controls.DataGrid.ChemicalElements/Main.cpp
@@ -1,4 +1,4 @@
-#include "..\..\Public\Source\GacUI.h"
+#include "..\..\Public\Source\GacUIReflection.h"
 #include "..\..\Public\Source\GacUIWindows.h"
 
 using namespace vl::regex;
@@ -552,6 +552,8 @@ GuiMain
 
 void GuiMain()
 {
+	description::GetTypeDescriptor<GuiWindow>(); // should be called due to VC++'s static library bug
+
 	GuiWindow* window=new ChemicalElementWindow;
 	GetApplication()->Run(window);
 	delete window;

diff --git a/GacUIDemo/Controls.DataGrid.FileExplorer/Controls.DataGrid.FileExplorer.vcxproj b/GacUIDemo/Controls.DataGrid.FileExplorer/Controls.DataGrid.FileExplorer.vcxproj
@@ -83,8 +83,8 @@
     <ClCompile Include="Main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\GacUIStaticLibrary\GacUIStaticLibrary.vcxproj">
-      <Project>{6698c71d-0d4e-4031-846a-8698f9c9d658}</Project>
+    <ProjectReference Include="..\GacUIReflectionStaticLibrary\GacUIReflectionStaticLibrary.vcxproj">
+      <Project>{8c242464-8009-4a8a-9443-abe406809c71}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/GacUIDemo/Controls.DataGrid.FileExplorer/Main.cpp b/GacUIDemo/Controls.DataGrid.FileExplorer/Main.cpp
@@ -1,4 +1,5 @@
 #include "..\CommonLibrary\FileSystemInformation.h"
+#include "..\..\Public\Source\GacUIReflection.h"
 
 using namespace vl::regex;
 using namespace vl::collections;
@@ -331,6 +332,8 @@ GuiMain
 
 void GuiMain()
 {
+	description::GetTypeDescriptor<GuiWindow>(); // should be called due to VC++'s static library bug
+
 	GuiWindow* window=new FileExplorerWindow;
 	GetApplication()->Run(window);
 	delete window;

diff --git a/GacUIDemo/Controls.Tab.TextBoxPage/Main.cpp b/GacUIDemo/Controls.Tab.TextBoxPage/Main.cpp
@@ -31,9 +31,13 @@ class TextBoxPage : public GuiTabPage
 		});
 	}
 
-	void OnPageContainerReady(GuiGraphicsComposition* sender, GuiEventArgs& arguments)
+public:
+	TextBoxPage()
+		:closeButton(0)
+		,textBox(0)
 	{
 		// create a table to place a button and a text box
+		this->SetText(L"TextBoxPage Sample No."+itow(++pageCounter));
 		GuiTableComposition* table=new GuiTableComposition;
 		table->SetRowsAndColumns(2, 1);
 		table->SetRowOption(0, GuiCellOption::MinSizeOption());
@@ -64,16 +68,7 @@ class TextBoxPage : public GuiTabPage
 			cell->AddChild(textBox->GetBoundsComposition());
 		}
 
-		this->GetContainer()->GetContainerComposition()->AddChild(table);
-	}
-
-public:
-	TextBoxPage()
-		:closeButton(0)
-		,textBox(0)
-	{
-		PageContainerReady.AttachMethod(this, &TextBoxPage::OnPageContainerReady);
-		this->SetText(L"TextBoxPage Sample No."+itow(++pageCounter));
+		this->GetContainerComposition()->AddChild(table);
 	}
 
 	~TextBoxPage()
@@ -117,8 +112,8 @@ class TextBoxPageWindow : public GuiWindow
 		buttonAddPage=g::NewButton();
 		buttonAddPage->SetText(L"Add a tab page");
 		buttonAddPage->Clicked.AttachMethod(this, &TextBoxPageWindow::buttonAddPage_Clicked);
-		controlPanelPage->GetContainer()->GetContainerComposition()->SetInternalMargin(Margin(2, 2, 2, 2));
-		controlPanelPage->GetContainer()->AddChild(buttonAddPage);
+		controlPanelPage->GetContainerComposition()->SetInternalMargin(Margin(2, 2, 2, 2));
+		controlPanelPage->GetContainerComposition()->AddChild(buttonAddPage->GetBoundsComposition());
 
 		this->ForceCalculateSizeImmediately();
 		this->MoveToScreenCenter();

diff --git a/GacUIDemo/Controls.Tooltip.RichTextAndResource/Main.cpp b/GacUIDemo/Controls.Tooltip.RichTextAndResource/Main.cpp
@@ -65,12 +65,12 @@ class TooltipWindow : public GuiWindow
 			L"Tooltips/SaveAs",
 		};
 
-		GuiToolstripToolbar* toolbar=g::NewToolbar();
+		GuiToolstripToolBar* toolbar=g::NewToolBar();
 		toolbar->GetBoundsComposition()->SetAlignmentToParent(Margin(0, 0, 0, -1));
 		AddChild(toolbar);
 		for(vint i=0;i<4;i++)
 		{
-			GuiToolstripButton* button=g::NewToolbarButton();
+			GuiToolstripButton* button=g::NewToolBarButton();
 			button->SetImage(resource->GetValueByPath(images[i]).Cast<GuiImageData>());
 			AddTooltip(button, resource, paths[i], 100);
 			toolbar->GetToolstripItems().Add(button);