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

Completed the migration of windows/window.c.

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

24
redo/windows/window.c → redo/migrated/windows/window.c
View File

@ -240,8 +240,7 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
WCHAR *wtitle; WCHAR *wtitle;
BOOL hasMenubarBOOL; BOOL hasMenubarBOOL;
w = uiNew(struct window); w = (struct window *) uiWindowsNewSingleHWNDControl(uiTypeWindow());
uiTyped(w)->Type = uiTypeWindow();
hasMenubarBOOL = FALSE; hasMenubarBOOL = FALSE;
if (hasMenubar) if (hasMenubar)
@ -277,24 +276,11 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
w->onClosing = defaultOnClosing; w->onClosing = defaultOnClosing;
uiControl(w)->Destroy = windowDestroy;
uiControl(w)->Handle = windowHandle; uiControl(w)->Handle = windowHandle;
uiControl(w)->Parent = windowParent; w->baseCommitDestroy = uiControl(w)->CommitDestroy;
uiControl(w)->SetParent = windowSetParent; uiControl(w)->CommitDestroy = windowCommitDestroy;
uiControl(w)->PreferredSize = windowPreferredSize; // simply overwrite this; TODO call the base one somehow?
uiControl(w)->Resize = windowResize; uiControl(w)->CommitShow = windowCommitShow;
uiControl(w)->QueueResize = windowQueueResize;
uiControl(w)->Sizing = windowSizing;
uiControl(w)->ContainerVisible = windowContainerVisible;
uiControl(w)->Show = windowShow;
uiControl(w)->Hide = windowHide;
// TODO
uiControl(w)->ContainerEnabled = windowContainerVisible;
uiControl(w)->Enable = windowEnable;
uiControl(w)->Disable = windowDisable;
uiControl(w)->SysFunc = windowSysFunc;
uiControl(w)->StartZOrder = windowStartZOrder;
// TODO other methods
uiWindow(w)->Title = windowTitle; uiWindow(w)->Title = windowTitle;
uiWindow(w)->SetTitle = windowSetTitle; uiWindow(w)->SetTitle = windowSetTitle;