diff -r 42506e19eb6b -r 25e5390cce41 ui/ui/toolkit.h --- a/ui/ui/toolkit.h Fri Jun 13 10:39:54 2014 +0200 +++ b/ui/ui/toolkit.h Tue Jul 22 09:51:17 2014 +0200 @@ -80,6 +80,8 @@ typedef struct UiContext UiContext; typedef struct UiContainer UiContainer; +typedef struct UiTabbedPane UiTabbedPane; + #define ui_getval(val) (val).get(&(val)) #define ui_setval(val, v) (val).set(&(val), v) @@ -110,7 +112,7 @@ /* * current document */ - void *document; + //void *document; /* * window context (private) @@ -128,6 +130,23 @@ UiObject *next; }; +struct UiTabbedPane { + /* + * native widget + */ + UIWIDGET widget; + + /* + * current document + */ + void *document; + + /* + * parent context + */ + UiContext *ctx; +}; + struct UiEvent { UiObject *obj; void *document; @@ -212,8 +231,22 @@ UIWIDGET ui_sidebar(UiObject *obj); void ui_end(UiObject *obj); + + + +UiTabbedPane* ui_tabbed_document_view(UiObject *obj); + +UiObject* ui_document_tab(UiTabbedPane *view); + + + + void ui_set_document(UiObject *obj, void *document); void ui_detach_document(UiObject *obj, void *document); +void* ui_get_document(UiObject *obj); +void ui_set_subdocument(void *document, void *sub); +void ui_detach_subdocument(void *document, void *sub); +void* ui_get_subdocument(void *document); void* ui_document_new(size_t size); void ui_document_destroy(void *doc); @@ -237,6 +270,8 @@ // new: int ui_getint(UiObject *obj, char *name); +char *ui_getstr(UiObject *obj, char *name); +char* ui_gettext(UiObject *obj, char *name); void ui_set_group(UiContext *ctx, int group);