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

More windows/window.c migration.

This commit is contained in:
Pietro Gagliardi 2015-05-30 21:24:33 -04:00
parent 2070551003
commit 205887d77d
1 changed files with 5 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
redo/windows/window.c
View File

@ -14,6 +14,7 @@ struct window {
int (*onClosing)(uiWindow *, void *); int (*onClosing)(uiWindow *, void *);
void *onClosingData; void *onClosingData;
int margined; int margined;
void (*baseCommitDestroy)(uiControl *);
}; };
uiDefineControlType(uiWindow, uiTypeWindow, struct window) uiDefineControlType(uiWindow, uiTypeWindow, struct window)
@ -85,7 +86,7 @@ static int defaultOnClosing(uiWindow *w, void *data)
return 0; return 0;
} }
static void windowDestroy(uiControl *c) static void windowCommitDestroy(uiControl *c)
{ {
struct window *w = (struct window *) c; struct window *w = (struct window *) c;
@ -102,9 +103,7 @@ static void windowDestroy(uiControl *c)
freeMenubar(w->menubar); freeMenubar(w->menubar);
// and finally destroy ourselves // and finally destroy ourselves
dialogHelperUnregisterWindow(w->hwnd); dialogHelperUnregisterWindow(w->hwnd);
if (DestroyWindow(w->hwnd) == 0) (*(w->baseCommitDestroy))(uiControl(w));
logLastError("error destroying uiWindow in windowDestroy()");
uiFree(w);
} }
static uintptr_t windowHandle(uiControl *c) static uintptr_t windowHandle(uiControl *c)
@ -114,23 +113,7 @@ static uintptr_t windowHandle(uiControl *c)
return (uintptr_t) (w->hwnd); return (uintptr_t) (w->hwnd);
} }
static void windowQueueResize(uiControl *c) static void windowCommitShow(uiControl *c)
{
queueResize(c);
}
static uiSizing *windowSizing(uiControl *c)
{
return uiWindowsSizing(c);
}
static int windowContainerVisible(uiControl *c)
{
// TODO
return 1;
}
static void windowShow(uiControl *c)
{ {
struct window *w = (struct window *) c; struct window *w = (struct window *) c;
@ -146,30 +129,7 @@ static void windowShow(uiControl *c)
logLastError("error calling UpdateWindow() after showing uiWindow for the first time in windowShow()"); logLastError("error calling UpdateWindow() after showing uiWindow for the first time in windowShow()");
} }
static void windowHide(uiControl *c) // TODO container update state
{
struct window *w = (struct window *) c;
ShowWindow(w->hwnd, SW_HIDE);
}
static void windowEnable(uiControl *c)
{
struct window *w = (struct window *) c;
EnableWindow(w->hwnd, TRUE);
if (w->child != NULL)
uiControlUpdateState(w->child);
}
static void windowDisable(uiControl *c)
{
struct window *w = (struct window *) c;
EnableWindow(w->hwnd, FALSE);
if (w->child != NULL)
uiControlUpdateState(w->child);
}
static char *windowTitle(uiWindow *ww) static char *windowTitle(uiWindow *ww)
{ {