Changed the WS_BORDER style to a WS_EX_CLIENTEDGE style for the

listbox control.
This commit is contained in:
Francis Beaudet 1999-07-30 17:58:24 +00:00 committed by Alexandre Julliard
parent bc0b020428
commit f6a225b84e
1 changed files with 26 additions and 12 deletions

View File

@ -2179,7 +2179,9 @@ static inline LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg,
if (!wnd) return 0; if (!wnd) return 0;
if (!(descr = *(LB_DESCR **)wnd->wExtra)) if (!(descr = *(LB_DESCR **)wnd->wExtra))
{ {
if (msg == WM_CREATE) switch (msg)
{
case WM_CREATE:
{ {
if (!LISTBOX_Create( wnd, NULL )) if (!LISTBOX_Create( wnd, NULL ))
return -1; return -1;
@ -2187,6 +2189,22 @@ static inline LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg,
hwnd, *(LB_DESCR **)wnd->wExtra ); hwnd, *(LB_DESCR **)wnd->wExtra );
return 0; return 0;
} }
case WM_NCCREATE:
{
/*
* When a listbox is not in a combobox and the look
* is win95, the WS_BORDER style is replaced with
* the WS_EX_CLIENTEDGE style.
*/
if ( (TWEAK_WineLook > WIN31_LOOK) &&
(wnd->dwStyle & WS_BORDER) )
{
wnd->dwExStyle |= WS_EX_CLIENTEDGE;
wnd->dwStyle &= ~ WS_BORDER;
}
}
}
/* Ignore all other messages before we get a WM_CREATE */ /* Ignore all other messages before we get a WM_CREATE */
return DefWindowProcA( hwnd, msg, wParam, lParam ); return DefWindowProcA( hwnd, msg, wParam, lParam );
} }
@ -2574,10 +2592,6 @@ static inline LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg,
} }
break; break;
case WM_NCCREATE:
if (TWEAK_WineLook > WIN31_LOOK)
wnd->dwExStyle |= WS_EX_CLIENTEDGE;
return DefWindowProcA( hwnd, msg, wParam, lParam );
default: default:
if ((msg >= WM_USER) && (msg < 0xc000)) if ((msg >= WM_USER) && (msg < 0xc000))
WARN("[%04x]: unknown msg %04x wp %08x lp %08lx\n", WARN("[%04x]: unknown msg %04x wp %08x lp %08lx\n",