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

Removed onWM_NOTIFY from uiWIndowsMakeControlParams.

This commit is contained in:
Pietro Gagliardi 2015-05-21 12:39:19 -04:00
parent 12b4d0a7c0
commit 50c7adf597
14 changed files with 2 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
redo/ui_windows.h
View File

@ -26,7 +26,6 @@ struct uiWindowsMakeControlParams {
// ui redirects the message back and calls these functions. // ui redirects the message back and calls these functions.
// Store the result in *lResult and return any non-FALSE value (such as TRUE) to return the given result; return FALSE to pass the notification up to your window procedure. // Store the result in *lResult and return any non-FALSE value (such as TRUE) to return the given result; return FALSE to pass the notification up to your window procedure.
// 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_NOTIFY)(uiControl *c, NMHDR *nm, LRESULT *lResult);
BOOL (*onWM_HSCROLL)(uiControl *c, WORD code, LRESULT *lResult); BOOL (*onWM_HSCROLL)(uiControl *c, WORD code, LRESULT *lResult);
// This is called when the widget is ready to be destroyed. // This is called when the widget is ready to be destroyed.

6
redo/windows/button.c
View File

@ -19,11 +19,6 @@ static BOOL onWM_COMMAND(uiControl *c, WORD code, LRESULT *lResult)
return TRUE; return TRUE;
} }
static BOOL onWM_NOTIFY(uiControl *c, NMHDR *nm, LRESULT *lResult)
{
return FALSE;
}
static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult) static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult)
{ {
return FALSE; return FALSE;
@ -101,7 +96,6 @@ uiButton *uiNewButton(const char *text)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL; p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_NOTIFY = onWM_NOTIFY;
p.onWM_HSCROLL = onWM_HSCROLL; p.onWM_HSCROLL = onWM_HSCROLL;
p.onDestroy = onDestroy; p.onDestroy = onDestroy;
p.onDestroyData = b; p.onDestroyData = b;

6
redo/windows/checkbox.c
View File

@ -27,11 +27,6 @@ static BOOL onWM_COMMAND(uiControl *cc, WORD code, LRESULT *lResult)
return TRUE; return TRUE;
} }
static BOOL onWM_NOTIFY(uiControl *c, NMHDR *nm, LRESULT *lResult)
{
return FALSE;
}
static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult) static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult)
{ {
return FALSE; return FALSE;
@ -116,7 +111,6 @@ uiCheckbox *uiNewCheckbox(const char *text)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL; p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_NOTIFY = onWM_NOTIFY;
p.onWM_HSCROLL = onWM_HSCROLL; p.onWM_HSCROLL = onWM_HSCROLL;
p.onDestroy = onDestroy; p.onDestroy = onDestroy;
p.onDestroyData = c; p.onDestroyData = c;

6
redo/windows/combobox.c
View File

@ -6,11 +6,6 @@ struct combobox {
HWND hwnd; HWND hwnd;
}; };
static BOOL onWM_NOTIFY(uiControl *c, NMHDR *nm, LRESULT *lResult)
{
return FALSE;
}
static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult) static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult)
{ {
return FALSE; return FALSE;
@ -63,7 +58,6 @@ uiCombobox *uiNewCombobox(void)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL; p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_NOTIFY = onWM_NOTIFY;
p.onWM_HSCROLL = onWM_HSCROLL; p.onWM_HSCROLL = onWM_HSCROLL;
p.onDestroy = onDestroy; p.onDestroy = onDestroy;
p.onDestroyData = c; p.onDestroyData = c;

6
redo/windows/container.c
View File

@ -58,11 +58,6 @@ void uninitContainer(void)
logLastError("error unregistering container window class in uninitContainer()"); logLastError("error unregistering container window class in uninitContainer()");
} }
static BOOL onWM_NOTIFY(uiControl *c, NMHDR *nm, LRESULT *lResult)
{
return FALSE;
}
static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult) static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult)
{ {
return FALSE; return FALSE;
@ -84,7 +79,6 @@ void uiMakeContainer(uiControl *c)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL; p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_NOTIFY = onWM_NOTIFY;
p.onWM_HSCROLL = onWM_HSCROLL; p.onWM_HSCROLL = onWM_HSCROLL;
p.onDestroy = onDestroy; p.onDestroy = onDestroy;
p.onDestroyData = NULL; p.onDestroyData = NULL;

2
redo/windows/control.c
View File

@ -13,7 +13,6 @@ void osSingleDestroy(void *internal)
struct singleHWND *s = (struct singleHWND *) internal; struct singleHWND *s = (struct singleHWND *) internal;
(*(s->onDestroy))(s->onDestroyData); (*(s->onDestroy))(s->onDestroyData);
uiWindowsUnregisterWM_NOTIFYHandler(s->hwnd);
uiWindowsUnregisterWM_HSCROLLHandler(s->hwnd); uiWindowsUnregisterWM_HSCROLLHandler(s->hwnd);
if (DestroyWindow(s->hwnd) == 0) if (DestroyWindow(s->hwnd) == 0)
logLastError("error destroying control in singleDestroy()"); logLastError("error destroying control in singleDestroy()");
@ -119,7 +118,6 @@ void uiWindowsMakeControl(uiControl *c, uiWindowsMakeControlParams *p)
if (s->hwnd == NULL) if (s->hwnd == NULL)
logLastError("error creating control in uiWindowsMakeControl()"); logLastError("error creating control in uiWindowsMakeControl()");
uiWindowsRegisterWM_NOTIFYHandler(s->hwnd, p->onWM_NOTIFY, uiControl(c));
uiWindowsRegisterWM_HSCROLLHandler(s->hwnd, p->onWM_HSCROLL, uiControl(c)); uiWindowsRegisterWM_HSCROLLHandler(s->hwnd, p->onWM_HSCROLL, uiControl(c));
s->onDestroy = p->onDestroy; s->onDestroy = p->onDestroy;

6
redo/windows/entry.c
View File

@ -22,11 +22,6 @@ static BOOL onWM_COMMAND(uiControl *c, WORD code, LRESULT *lResult)
return TRUE; return TRUE;
} }
static BOOL onWM_NOTIFY(uiControl *c, NMHDR *nm, LRESULT *lResult)
{
return FALSE;
}
static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult) static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult)
{ {
return FALSE; return FALSE;
@ -112,7 +107,6 @@ uiEntry *uiNewEntry(void)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL; p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_NOTIFY = onWM_NOTIFY;
p.onWM_HSCROLL = onWM_HSCROLL; p.onWM_HSCROLL = onWM_HSCROLL;
p.onDestroy = onDestroy; p.onDestroy = onDestroy;
p.onDestroyData = e; p.onDestroyData = e;

6
redo/windows/group.c
View File

@ -6,11 +6,6 @@ struct group {
HWND hwnd; HWND hwnd;
}; };
static BOOL onWM_NOTIFY(uiControl *c, NMHDR *nm, LRESULT *lResult)
{
return FALSE;
}
static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult) static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult)
{ {
return FALSE; return FALSE;
@ -50,7 +45,6 @@ uiGroup *uiNewGroup(const char *text)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL; p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_NOTIFY = onWM_NOTIFY;
p.onWM_HSCROLL = onWM_HSCROLL; p.onWM_HSCROLL = onWM_HSCROLL;
p.onDestroy = onDestroy; p.onDestroy = onDestroy;
p.onDestroyData = g; p.onDestroyData = g;

6
redo/windows/label.c
View File

@ -6,11 +6,6 @@ struct label {
HWND hwnd; HWND hwnd;
}; };
static BOOL onWM_NOTIFY(uiControl *c, NMHDR *nm, LRESULT *lResult)
{
return FALSE;
}
static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult) static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult)
{ {
return FALSE; return FALSE;
@ -63,7 +58,6 @@ uiLabel *uiNewLabel(const char *text)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL; p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_NOTIFY = onWM_NOTIFY;
p.onWM_HSCROLL = onWM_HSCROLL; p.onWM_HSCROLL = onWM_HSCROLL;
p.onDestroy = onDestroy; p.onDestroy = onDestroy;
p.onDestroyData = l; p.onDestroyData = l;

6
redo/windows/progressbar.c
View File

@ -6,11 +6,6 @@ struct progressbar {
HWND hwnd; HWND hwnd;
}; };
static BOOL onWM_NOTIFY(uiControl *c, NMHDR *nm, LRESULT *lResult)
{
return FALSE;
}
static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult) static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult)
{ {
return FALSE; return FALSE;
@ -58,7 +53,6 @@ uiProgressBar *uiNewProgressBar(void)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL; p.lpParam = NULL;
p.useStandardControlFont = FALSE; p.useStandardControlFont = FALSE;
p.onWM_NOTIFY = onWM_NOTIFY;
p.onWM_HSCROLL = onWM_HSCROLL; p.onWM_HSCROLL = onWM_HSCROLL;
p.onDestroy = onDestroy; p.onDestroy = onDestroy;
p.onDestroyData = pbar; p.onDestroyData = pbar;

6
redo/windows/separator.c
View File

@ -10,11 +10,6 @@ struct separator {
HWND hwnd; HWND hwnd;
}; };
static BOOL onWM_NOTIFY(uiControl *c, NMHDR *nm, LRESULT *lResult)
{
return FALSE;
}
static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult) static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult)
{ {
return FALSE; return FALSE;
@ -52,7 +47,6 @@ uiSeparator *uiNewHorizontalSeparator(void)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL; p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_NOTIFY = onWM_NOTIFY;
p.onWM_HSCROLL = onWM_HSCROLL; p.onWM_HSCROLL = onWM_HSCROLL;
p.onDestroy = onDestroy; p.onDestroy = onDestroy;
p.onDestroyData = s; p.onDestroyData = s;

6
redo/windows/slider.c
View File

@ -13,11 +13,6 @@ struct slider {
void *onChangedData; void *onChangedData;
}; };
static BOOL onWM_NOTIFY(uiControl *c, NMHDR *nm, LRESULT *lResult)
{
return FALSE;
}
static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult) static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult)
{ {
struct slider *s = (struct slider *) c; struct slider *s = (struct slider *) c;
@ -89,7 +84,6 @@ uiSlider *uiNewSlider(intmax_t min, intmax_t max)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL; p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_NOTIFY = onWM_NOTIFY;
p.onWM_HSCROLL = onWM_HSCROLL; p.onWM_HSCROLL = onWM_HSCROLL;
p.onDestroy = onDestroy; p.onDestroy = onDestroy;
p.onDestroyData = s; p.onDestroyData = s;

6
redo/windows/spinbox.c
View File

@ -47,11 +47,6 @@ static BOOL onWM_COMMAND(uiControl *c, WORD code, LRESULT *lResult)
return TRUE; return TRUE;
} }
static BOOL onWM_NOTIFY(uiControl *c, NMHDR *nm, LRESULT *lResult)
{
return FALSE;
}
static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult) static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult)
{ {
return FALSE; return FALSE;
@ -170,7 +165,6 @@ uiSpinbox *uiNewSpinbox(intmax_t min, intmax_t max)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL; p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_NOTIFY = onWM_NOTIFY;
p.onWM_HSCROLL = onWM_HSCROLL; p.onWM_HSCROLL = onWM_HSCROLL;
p.onDestroy = onDestroy; p.onDestroy = onDestroy;
p.onDestroyData = s; p.onDestroyData = s;

3
redo/windows/tab.c
View File

@ -62,6 +62,7 @@ static BOOL onWM_HSCROLL(uiControl *c, WORD code, LRESULT *lResult)
static void onDestroy(void *data) static void onDestroy(void *data)
{ {
// TODO // TODO
//TODO uiWindowsUnregisterWM_NOTIFYHandler(t->hwnd);
} }
// from http://msdn.microsoft.com/en-us/library/windows/desktop/bb226818%28v=vs.85%29.aspx // from http://msdn.microsoft.com/en-us/library/windows/desktop/bb226818%28v=vs.85%29.aspx
@ -213,13 +214,13 @@ uiTab *uiNewTab(void)
p.hInstance = hInstance; p.hInstance = hInstance;
p.lpParam = NULL; p.lpParam = NULL;
p.useStandardControlFont = TRUE; p.useStandardControlFont = TRUE;
p.onWM_NOTIFY = onWM_NOTIFY;
p.onWM_HSCROLL = onWM_HSCROLL; p.onWM_HSCROLL = onWM_HSCROLL;
p.onDestroy = onDestroy; p.onDestroy = onDestroy;
p.onDestroyData = t; p.onDestroyData = t;
uiWindowsMakeControl(uiControl(t), &p); uiWindowsMakeControl(uiControl(t), &p);
t->hwnd = (HWND) uiControlHandle(uiControl(t)); t->hwnd = (HWND) uiControlHandle(uiControl(t));
uiWindowsRegisterWM_NOTIFYHandler(t->hwnd, onWM_NOTIFY, uiControl(t));
t->pages = newPtrArray(); t->pages = newPtrArray();