mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-14 17:27:18 +00:00
Hack to support integer ids in all static controls.
This commit is contained in:
parent
27829e4337
commit
0108d6423e
|
@ -174,13 +174,14 @@ LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
|
||||||
|
|
||||||
switch (uMsg)
|
switch (uMsg)
|
||||||
{
|
{
|
||||||
case WM_NCCREATE:
|
case WM_NCCREATE: {
|
||||||
|
CREATESTRUCT32A *cs = (CREATESTRUCT32A *)lParam;
|
||||||
|
|
||||||
if ((TWEAK_WineLook > WIN31_LOOK) && (wndPtr->dwStyle & SS_SUNKEN))
|
if ((TWEAK_WineLook > WIN31_LOOK) && (wndPtr->dwStyle & SS_SUNKEN))
|
||||||
wndPtr->dwExStyle |= WS_EX_STATICEDGE;
|
wndPtr->dwExStyle |= WS_EX_STATICEDGE;
|
||||||
|
|
||||||
if (style == SS_ICON)
|
if (style == SS_ICON)
|
||||||
{
|
{
|
||||||
CREATESTRUCT32A *cs = (CREATESTRUCT32A *)lParam;
|
|
||||||
if (cs->lpszName)
|
if (cs->lpszName)
|
||||||
STATIC_SetIcon( wndPtr,
|
STATIC_SetIcon( wndPtr,
|
||||||
STATIC_LoadIcon( wndPtr, cs->lpszName ));
|
STATIC_LoadIcon( wndPtr, cs->lpszName ));
|
||||||
|
@ -188,7 +189,6 @@ LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
|
||||||
}
|
}
|
||||||
if (style == SS_BITMAP)
|
if (style == SS_BITMAP)
|
||||||
{
|
{
|
||||||
CREATESTRUCT32A *cs = (CREATESTRUCT32A *)lParam;
|
|
||||||
if (cs->lpszName)
|
if (cs->lpszName)
|
||||||
STATIC_SetBitmap( wndPtr,
|
STATIC_SetBitmap( wndPtr,
|
||||||
STATIC_LoadBitmap( wndPtr, cs->lpszName ));
|
STATIC_LoadBitmap( wndPtr, cs->lpszName ));
|
||||||
|
@ -196,8 +196,14 @@ LRESULT WINAPI StaticWndProc( HWND32 hWnd, UINT32 uMsg, WPARAM32 wParam,
|
||||||
wndPtr->dwStyle);
|
wndPtr->dwStyle);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
if (!HIWORD(cs->lpszName)) {
|
||||||
|
FIXME(static,"windowName is 0x%04x, not doing DefWindowProc\n",
|
||||||
|
LOWORD(cs->lpszName)
|
||||||
|
);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
return DefWindowProc32A( hWnd, uMsg, wParam, lParam );
|
return DefWindowProc32A( hWnd, uMsg, wParam, lParam );
|
||||||
|
}
|
||||||
case WM_CREATE:
|
case WM_CREATE:
|
||||||
if (style < 0L || style > SS_TYPEMASK)
|
if (style < 0L || style > SS_TYPEMASK)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue