diff -r d276306d801f -r 1c943d43fa81 ui/wpf/UIwrapper/UIwrapper/controls.cpp --- a/ui/wpf/UIwrapper/UIwrapper/controls.cpp Sun Jan 17 19:19:28 2016 +0100 +++ b/ui/wpf/UIwrapper/UIwrapper/controls.cpp Wed Jan 20 11:35:01 2016 +0100 @@ -7,6 +7,8 @@ #using "UIcore.dll" +/* ------------------------------ Buttons ------------------------------ */ + UI_EXPORT void* __stdcall UIbutton(gcroot *container, char *label, UIcallback f, void *eventdata) { gcroot *button = new gcroot(); @@ -18,6 +20,29 @@ } +/* ------------------------------ Labels ------------------------------ */ + +UI_EXPORT void* __stdcall UIlabel(gcroot *container, char *label, int alignment) { + gcroot *control = new gcroot(); + *control = UI::Controls::Label(*container, gcnew String(label), alignment); + return control; +} + +UI_EXPORT void* __stdcall UIspace(gcroot *container) { + gcroot *control = new gcroot(); + + *control = UI::Controls::Space(*container); + return control; +} + +UI_EXPORT void* __stdcall UIseparator(gcroot *container) { + return NULL; +} + + + +/* ------------------------------ Textarea ------------------------------ */ + UI_EXPORT void* __stdcall UItextarea(gcroot *container, char *text) { String ^str = nullptr; if (text) { @@ -67,3 +92,18 @@ UI_EXPORT void __stdcall UIfreestr(char *str) { Marshal::FreeHGlobal((IntPtr)(void*)str); } + + +/* ------------------------------ Textfield ------------------------------ */ + +UI_EXPORT void* __stdcall UItextfield(gcroot *container, char *text) { + String ^str = nullptr; + if (text) { + str = gcnew String(text); + } + + gcroot *textfield = new gcroot(); + *textfield = UI::TextArea::CreateTextField(*container, str); + + return textfield; +} \ No newline at end of file