More fixes.

This commit is contained in:
Pietro Gagliardi 2016-04-23 22:23:07 -04:00
parent 5236aa5855
commit 158db39b68
6 changed files with 7 additions and 7 deletions

View File

@ -97,7 +97,7 @@ BOOL runWM_NOTIFY(WPARAM wParam, LPARAM lParam, LRESULT *lResult)
{ {
HWND hwnd; HWND hwnd;
NMHDR *arg3; NMHDR *arg3;
BOOL (*handler)(uiControl *, HWND, WORD, LRESULT *); BOOL (*handler)(uiControl *, HWND, NMHDR *, LRESULT *);
uiControl *c; uiControl *c;
arg3 = (NMHDR *) lParam; arg3 = (NMHDR *) lParam;

View File

@ -56,7 +56,7 @@ static void groupRelayout(uiWindowsControl *c, intmax_t x, intmax_t y, intmax_t
uiGroup *g = uiGroup(c); uiGroup *g = uiGroup(c);
uiWindowsSizing *d; uiWindowsSizing *d;
uiWindowsEnsureMoveWindow(g->hwnd, x, y, width, height); uiWindowsEnsureMoveWindowDuringResize(g->hwnd, x, y, width, height);
if (g->child == NULL) if (g->child == NULL)
return; return;

View File

@ -80,7 +80,7 @@ static void radiobuttonsRelayout(uiWindowsControl *c, intmax_t x, intmax_t y, in
intmax_t h; intmax_t h;
HWND hwnd; HWND hwnd;
uiWindowsEnsureMoveWindow(r->hwnd, x, y, width, height); uiWindowsEnsureMoveWindowDuringResize(r->hwnd, x, y, width, height);
x = 0; x = 0;
y = 0; y = 0;
@ -91,7 +91,7 @@ static void radiobuttonsRelayout(uiWindowsControl *c, intmax_t x, intmax_t y, in
h = height1; h = height1;
if (h > height) // clip to height if (h > height) // clip to height
h = height; h = height;
uiWindowsEnsureMoveWindow(hwnd, x, y, width, h); uiWindowsEnsureMoveWindowDuringResize(hwnd, x, y, width, h);
y += height1; y += height1;
height -= height1; height -= height1;
if (height <= 0) // clip to height if (height <= 0) // clip to height

View File

@ -133,7 +133,7 @@ static void spinboxRelayout(uiWindowsControl *c, intmax_t x, intmax_t y, intmax_
{ {
uiSpinbox *s = uiSpinbox(c); uiSpinbox *s = uiSpinbox(c);
uiWindowsEnsureMoveWindow(s->hwnd, x, y, width, height); uiWindowsEnsureMoveWindowDuringResize(s->hwnd, x, y, width, height);
recreateUpDown(s); recreateUpDown(s);
} }

View File

@ -123,7 +123,7 @@ static void tabRelayout(uiWindowsControl *c, intmax_t x, intmax_t y, intmax_t wi
struct child *page; struct child *page;
RECT r; RECT r;
uiWindowsEnsureMoveWindow(t->hwnd, x, y, width, height); uiWindowsEnsureMoveWindowDuringResize(t->hwnd, x, y, width, height);
n = curpage(t); n = curpage(t);
if (n == (LRESULT) (-1)) if (n == (LRESULT) (-1))
return; return;

View File

@ -54,7 +54,7 @@ extern HRESULT _logLastError(debugargs, const WCHAR *s);
extern HRESULT _logHRESULT(debugargs, const WCHAR *s, HRESULT hr); extern HRESULT _logHRESULT(debugargs, const WCHAR *s, HRESULT hr);
#define logHRESULT(s, hr) _logHRESULT(_ws(__FILE__), _wsn(__LINE__), _ws(__FUNCTION__), s, hr) #define logHRESULT(s, hr) _logHRESULT(_ws(__FILE__), _wsn(__LINE__), _ws(__FUNCTION__), s, hr)
extern void _implbug(debugargs, const WCHAR *format, ...); extern void _implbug(debugargs, const WCHAR *format, ...);
#define implbug(...) _implbug(_ws(__FILE__), _wsn(__LINE__), _ws(__FUNCTION__), __VA_LIST__) #define implbug(...) _implbug(_ws(__FILE__), _wsn(__LINE__), _ws(__FUNCTION__), __VA_ARGS__)
// winutil.cpp // winutil.cpp
extern int windowClassOf(HWND hwnd, ...); extern int windowClassOf(HWND hwnd, ...);