diff --git a/redo/unix/GNUmakeinc.mk b/redo/unix/GNUmakeinc.mk index 301698b8..b64534ba 100644 --- a/redo/unix/GNUmakeinc.mk +++ b/redo/unix/GNUmakeinc.mk @@ -18,6 +18,7 @@ osCFILES = \ unix/separator.c \ unix/slider.c \ unix/spinbox.c \ + unix/stddialogs.c \ unix/tab.c \ unix/text.c \ unix/util.c \ diff --git a/redo/unix/container.c b/redo/unix/container.c index d22473f2..644a45f1 100644 --- a/redo/unix/container.c +++ b/redo/unix/container.c @@ -150,5 +150,6 @@ uintptr_t uiMakeContainer(uiControl *c) widget = GTK_WIDGET(g_object_new(containerWidgetType, NULL)); uiUnixMakeSingleWidgetControl(c, widget); + containerWidget(widget)->c = c; return (uintptr_t) widget; } diff --git a/redo/unix/menu.c b/redo/unix/menu.c index a997ea6a..8ee571cb 100644 --- a/redo/unix/menu.c +++ b/redo/unix/menu.c @@ -149,6 +149,8 @@ static uiMenuItem *newItem(struct menu *m, int type, const char *name) complain("attempt to create a new menu item after menus have been finalized"); item = uiNew(struct menuItem); + uiTyped(item)->Type = uiTypeMenuItem(); + g_array_append_val(m->items, item); item->type = type; @@ -248,6 +250,8 @@ uiMenu *uiNewMenu(const char *name) menus = g_array_new(FALSE, TRUE, sizeof (struct menu *)); m = uiNew(struct menu); + uiTyped(m)->Type = uiTypeMenu(); + g_array_append_val(menus, m); m->name = g_strdup(name); diff --git a/redo/unix/stddialogs.c b/redo/unix/stddialogs.c new file mode 100644 index 00000000..25f48b97 --- /dev/null +++ b/redo/unix/stddialogs.c @@ -0,0 +1,20 @@ +// 26 june 2015 +#include "uipriv_unix.h" + +char *uiOpenFile(void) +{ + return NULL; +} + +char *uiSaveFile(void) +{ + return NULL; +} + +void uiMsgBox(const char *title, const char *description) +{ +} + +void uiMsgBoxError(const char *title, const char *description) +{ +} diff --git a/redo/unix/window.c b/redo/unix/window.c index d2600a62..9bcd5fda 100644 --- a/redo/unix/window.c +++ b/redo/unix/window.c @@ -115,7 +115,7 @@ static void windowSetChild(uiWindow *ww, uiControl *child) uiControlSetParent(w->child, NULL); w->child = child; if (w->child != NULL) { - uiControlSetParent(w->child, uiControl(w)); +//TODO uiControlSetParent(w->child, uiControl(w)); uiControlQueueResize(w->child); } }