Mercurial > hg > toolkit / file diff

--- a/ui/wpf/UIwrapper/UIwrapper/container.cpp	Sun Jan 17 19:19:28 2016 +0100
+++ b/ui/wpf/UIwrapper/UIwrapper/container.cpp	Wed Jan 20 11:35:01 2016 +0100
@@ -21,6 +21,13 @@
 	return container;
 }
 
+UI_EXPORT void* __stdcall UIgrid(gcroot<UI::Container^> *parent, int margin, int columnspacing, int rowspacing) {
+	UI::GridContainer ^grid = UI::GridContainer::CreateGridContainer(*parent, margin, columnspacing, rowspacing);
+	gcroot<UI::GridContainer^> *container = new gcroot<UI::GridContainer^>();
+	*container = grid;
+	return container;
+}
+
 
 
 /* ------------------- layout functions ------------------- */
@@ -29,3 +36,19 @@
 	UI::Container ^ct = *container;
 	ct->Layout->Fill = fill != 0;
 }
+
+UI_EXPORT void __stdcall UIlayout_hexpand(gcroot<UI::Container^> *container, int expand) {
+	UI::Container ^ct = *container;
+	ct->Layout->Hexpand = expand != 0;
+}
+
+UI_EXPORT void __stdcall UIlayout_vexpand(gcroot<UI::Container^> *container, int expand) {
+	UI::Container ^ct = *container;
+	ct->Layout->Vexpand = expand != 0;
+}
+
+UI_EXPORT void __stdcall UIlayout_newline(gcroot<UI::Container^> *container) {
+	UI::Container ^ct = *container;
+	ct->Layout->NewLine = true;
+}
+