Mercurial > hg > toolkit / file diff

--- a/ui/wpf/UIwrapper/UIwrapper/container.cpp	Mon Jan 23 10:50:22 2017 +0100
+++ b/ui/wpf/UIwrapper/UIwrapper/container.cpp	Mon Jan 23 12:17:34 2017 +0100
@@ -7,15 +7,15 @@
 
 #using "UIcore.dll"
 
-UI_EXPORT void* __stdcall UIvbox(gcroot<UI::Container^> *parent) {
-	UI::BoxContainer ^vbox = gcnew UI::BoxContainer(*parent, UI::BoxOrientation::VERTICAL);
+UI_EXPORT void* __stdcall UIvbox(gcroot<UI::Container^> *parent, int margin, int spacing) {
+	UI::BoxContainer ^vbox = gcnew UI::BoxContainer(*parent, UI::BoxOrientation::VERTICAL, margin, spacing);
 	gcroot<UI::BoxContainer^> *container = new gcroot<UI::BoxContainer^>();
 	*container = vbox;
 	return container;
 }
 
-UI_EXPORT void* __stdcall UIhbox(gcroot<UI::Container^> *parent) {
-	UI::BoxContainer ^hbox = gcnew UI::BoxContainer(*parent, UI::BoxOrientation::HORIZONTAL);
+UI_EXPORT void* __stdcall UIhbox(gcroot<UI::Container^> *parent, int margin, int spacing) {
+	UI::BoxContainer ^hbox = gcnew UI::BoxContainer(*parent, UI::BoxOrientation::HORIZONTAL, margin, spacing);
 	gcroot<UI::BoxContainer^> *container = new gcroot<UI::BoxContainer^>();
 	*container = hbox;
 	return container;
@@ -28,6 +28,25 @@
 	return container;
 }
 
+UI_EXPORT void* __stdcall UIscrolledwindow(gcroot<UI::Container^> *parent) {
+	UI::ScrollViewerContainer ^scrollviewer = gcnew UI::ScrollViewerContainer(*parent);
+	gcroot<UI::ScrollViewerContainer^> *container = new gcroot<UI::ScrollViewerContainer^>();
+	*container = scrollviewer;
+	return container;
+}
+
+UI_EXPORT void* __stdcall UItabview(gcroot<UI::Container^> *parent) {
+	UI::TabViewContainer ^tabview = gcnew UI::TabViewContainer(*parent);
+	gcroot<UI::TabViewContainer^> *container = new gcroot<UI::TabViewContainer^>();
+	*container = tabview;
+	return container;
+}
+
+UI_EXPORT void __stdcall UItab(gcroot<UI::Container^> *container, char *label) {
+	UI::Container ^ct = *container;
+	ct->Layout->Label = gcnew String(label);
+}
+
 
 
 /* ------------------- layout functions ------------------- */