interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed child handling in WPF uiWindows.

This commit is contained in:
Pietro Gagliardi 2015-11-25 22:22:12 -05:00
parent e279c7b319
commit a46d0a760c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wpf/window.cpp
View File

@ -50,7 +50,12 @@ static void onDestroy(uiWindow *w)
// take off the closing event; otherwise it will be recursed // take off the closing event; otherwise it will be recursed
(*(w->window))->Closing -= *(w->onClosingDelegate); (*(w->window))->Closing -= *(w->onClosingDelegate);
delete w->onClosingDelegate; delete w->onClosingDelegate;
// TODO // then destroy the child
if (w->child != NULL) {
(*(w->border))->Child = nullptr;
uiControlSetParent(w->child, NULL);
uiControlDestroy(w->child);
}
// clean up remaining .net objects // clean up remaining .net objects
delete w->border; delete w->border;
} }
@ -72,12 +77,10 @@ static void windowCommitHide(uiControl *c)
static void windowContainerUpdateState(uiControl *c) static void windowContainerUpdateState(uiControl *c)
{ {
/*TODO
uiWindow *w = uiWindow(c); uiWindow *w = uiWindow(c);
if (w->child != NULL) if (w->child != NULL)
childUpdateState(w->child); controlUpdateState(w->child);
*/
} }
char *uiWindowTitle(uiWindow *w) char *uiWindowTitle(uiWindow *w)
@ -99,13 +102,13 @@ void uiWindowOnClosing(uiWindow *w, int (*f)(uiWindow *, void *), void *data)
void uiWindowSetChild(uiWindow *w, uiControl *child) void uiWindowSetChild(uiWindow *w, uiControl *child)
{ {
if (w->child != NULL) { if (w->child != NULL) {
(*(w->border))->Child = nullptr;
uiControlSetParent(w->child, NULL); uiControlSetParent(w->child, NULL);
(*(w->border))->Child = nullptr;
} }
w->child = child; w->child = child;
if (w->child != NULL) { if (w->child != NULL) {
uiControlSetParent(w->child, uiControl(w));
(*(w->border))->Child = genericHandle(w->child); (*(w->border))->Child = genericHandle(w->child);
uiControlSetParent(w->child, uiControl(w));
} }
} }