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

Finished Windows cleanup management. Everything (almost, only parentWindow is still around, but that shouldn't be a uiWindow to begin with) now cleaned!

This commit is contained in:
Pietro Gagliardi 2015-04-08 00:51:50 -04:00
parent df4c5f270c
commit 00e31d0a2b
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
button_windows.c
View File

@ -23,6 +23,13 @@ static BOOL onWM_NOTIFY(uiControl *c, WPARAM wParam, LPARAM lParam, void *data,
return FALSE; return FALSE;
} }
static void onWM_DESTROY(uiControl *c, void *data)
{
struct button *b = (struct button *) data;
uiFree(b);
}
// from http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing // from http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing
#define buttonHeight 14 #define buttonHeight 14
@ -70,7 +77,8 @@ uiControl *uiNewButton(const char *text)
p.hInstance = hInstance; p.hInstance = hInstance;
p.onWM_COMMAND = onWM_COMMAND; p.onWM_COMMAND = onWM_COMMAND;
p.onWM_NOTIFY = onWM_NOTIFY; p.onWM_NOTIFY = onWM_NOTIFY;
p.onCommandNotifyData = b; p.onWM_DESTROY = onWM_DESTROY;
p.onCommandNotifyDestroyData = b;
p.preferredSize = preferredSize; p.preferredSize = preferredSize;
p.data = b; p.data = b;
b->c = uiWindowsNewControl(&p); b->c = uiWindowsNewControl(&p);

16
newcontrol_windows.c
View File

@ -8,7 +8,8 @@ struct uiSingleHWNDControl {
HWND hwnd; HWND hwnd;
BOOL (*onWM_COMMAND)(uiControl *, WPARAM, LPARAM, void *, LRESULT *); BOOL (*onWM_COMMAND)(uiControl *, WPARAM, LPARAM, void *, LRESULT *);
BOOL (*onWM_NOTIFY)(uiControl *, WPARAM, LPARAM, void *, LRESULT *); BOOL (*onWM_NOTIFY)(uiControl *, WPARAM, LPARAM, void *, LRESULT *);
void *onCommandNotifyData; void (*onWM_DESTROY)(uiControl *, void *);
void *onCommandNotifyDestroyData;
void (*preferredSize)(uiControl *, int, int, LONG, intmax_t *, intmax_t *); void (*preferredSize)(uiControl *, int, int, LONG, intmax_t *, intmax_t *);
void *data; void *data;
}; };
@ -56,16 +57,18 @@ static LRESULT CALLBACK singleSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
switch (uMsg) { switch (uMsg) {
case msgCOMMAND: case msgCOMMAND:
if ((*(c->onWM_COMMAND))((uiControl *) c, wParam, lParam, c->onCommandNotifyData, &lResult) != FALSE) if ((*(c->onWM_COMMAND))((uiControl *) c, wParam, lParam, c->onCommandNotifyDestroyData, &lResult) != FALSE)
return lResult; return lResult;
break; break;
case msgNOTIFY: case msgNOTIFY:
if ((*(c->onWM_NOTIFY))((uiControl *) c, wParam, lParam, c->onCommandNotifyData, &lResult) != FALSE) if ((*(c->onWM_NOTIFY))((uiControl *) c, wParam, lParam, c->onCommandNotifyDestroyData, &lResult) != FALSE)
return lResult; return lResult;
break; break;
case WM_NCDESTROY: case WM_DESTROY:
// TODO call an onDestroy handler (*(c->onWM_DESTROY))((uiControl *) c, c->onCommandNotifyDestroyData);
uiFree(c); uiFree(c);
break;
case WM_NCDESTROY:
if ((*fv_RemoveWindowSubclass)(hwnd, singleSubclassProc, uIdSubclass) == FALSE) if ((*fv_RemoveWindowSubclass)(hwnd, singleSubclassProc, uIdSubclass) == FALSE)
logLastError("error removing Windows control subclass in singleSubclassProc()"); logLastError("error removing Windows control subclass in singleSubclassProc()");
break; break;
@ -96,7 +99,8 @@ uiControl *uiWindowsNewControl(uiWindowsNewControlParams *p)
c->onWM_COMMAND = p->onWM_COMMAND; c->onWM_COMMAND = p->onWM_COMMAND;
c->onWM_NOTIFY = p->onWM_NOTIFY; c->onWM_NOTIFY = p->onWM_NOTIFY;
c->onCommandNotifyData = p->onCommandNotifyData; c->onWM_DESTROY = p->onWM_DESTROY;
c->onCommandNotifyDestroyData = p->onCommandNotifyDestroyData;
c->preferredSize = p->preferredSize; c->preferredSize = p->preferredSize;
c->data = p->data; c->data = p->data;

6
ui_windows.h
View File

@ -23,8 +23,10 @@ struct uiWindowsNewControlParams {
// Note that these are only issued if they come from the uiControl itself; notifications from children of the uiControl (such as a header control) will be received normally. // Note that these are only issued if they come from the uiControl itself; notifications from children of the uiControl (such as a header control) will be received normally.
BOOL (*onWM_COMMAND)(uiControl *c, WPARAM wParam, LPARAM lParam, void *data, LRESULT *lResult); BOOL (*onWM_COMMAND)(uiControl *c, WPARAM wParam, LPARAM lParam, void *data, LRESULT *lResult);
BOOL (*onWM_NOTIFY)(uiControl *c, WPARAM wParam, LPARAM lParam, void *data, LRESULT *lResult); BOOL (*onWM_NOTIFY)(uiControl *c, WPARAM wParam, LPARAM lParam, void *data, LRESULT *lResult);
// This is the data parameter to both of the above. // This is called in WM_DESTROY.
void *onCommandNotifyData; void (*onWM_DESTROY)(uiControl *c, void *data);
// This is the data parameter to all three of the above.
void *onCommandNotifyDestroyData;
// This function is called when ui needs to know how to rearrange controls in a window. // This function is called when ui needs to know how to rearrange controls in a window.
// baseX and baseY are the base units used to convert between dialog units and pixels. // baseX and baseY are the base units used to convert between dialog units and pixels.