Release 961208
Sun Dec 8 14:51:57 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in]
Added check to see if the compiler supports building a DLL when
the --with-dll option is used.
* [controls/listbox.c]
Don't send LBN_SELCHANGE too often.
Added WM_CHARTOITEM support.
* [Make.rules.in] [library/Makefile.in]
Build winestub.o and link it with Winelib programs.
* [objects/text.c]
Added support for '&&' in DrawText().
* [tools/build.c]
Added -o option.
Sat Dec 7 12:07:07 1996 Andrew Lewycky <plewycky@oise.utoronto.ca>
* [win32/thread.c]
GetCurrentThread(): return -2 (current thread pseudo-handle).
GetCurrentThreadId(): return GetCurrentTask().
* [objects/font.c] [if1632/gdi32.spec]
GetTextExtentPoint32{A,W}Buggy(): for future bug-compatibility.
* [win32/findfile.c]
FindClose(): ignore INVALID_HANDLE_VALUE (like Win95).
* [windows/hook.c] [include/hook.h] [if1632/user.spec]
[if1632/user32.spec] [windows/focus.c] [windows/message.c]
[windows/nonclient.c] [windows/win.c] [windows/winpos.c]
Hooks rewritten to support Win32.
* [misc/winsock.c]
WINSOCK_select(): need to put sockets with errors into exceptfds.
WINSOCK_socket(): fix error return.
* [windows/win.c]
SetWindowWord(): call SetParent on GWW_HWNDPARENT.
Wed Dec 4 22:03:05 1996 Andrew Taylor <andrew@riscan.com>
* [files/dos_fs.c]
Check if buf is NULL before copying string in GetFullPathName32A().
Wed Dec 4 21:40:59 1996 Robert Pouliot <krynos@clic.net>
* [graphics/wing.c] [if1632/wing.spec]
Implemented many WinG functions, but some don't seem to
work correctly (probably due to the one not done).
Wed Dec 4 03:38:25 1996 Lee Jaekil <juria@puma.kaitech.re.kr>
* [misc/main.c]
Implemented a few more of the SystemParametersInfo() cases.
Sun Dec 1 22:30:00 1996 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [controls/button.c]
Improved focus rectangle painting.
* [windows/dialog.c] [windows/defdlg.c]
Fixed IE3.0 problems with DWL_MSGRESULT.
Sun Dec 1 20:49:32 1996 Albrecht Kleine <kleine@ak.sax.de>
* [files/profile.c]
Changed error handling in PROFILE_SetString().
diff --git a/controls/listbox.c b/controls/listbox.c
index bad86a7..a39048b 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -1130,8 +1130,6 @@
LISTBOX_RepaintItem( wnd, descr, i, ODA_SELECT );
}
}
- if (descr->style & LBS_NOTIFY)
- SEND_NOTIFICATION( wnd, descr, LBN_SELCHANGE );
return LB_OKAY;
}
@@ -1180,7 +1178,6 @@
if (oldsel != -1) descr->items[oldsel].selected = FALSE;
if (index != -1) descr->items[index].selected = TRUE;
descr->selected_item = index;
-/* FIXME if (index != -1) LISTBOX_MakeItemVisible( wnd, descr, index );*/
if (oldsel != -1) LISTBOX_RepaintItem( wnd, descr, oldsel, ODA_SELECT);
if (index != -1) LISTBOX_RepaintItem( wnd, descr, index, ODA_SELECT );
if (send_notify) SEND_NOTIFICATION( wnd, descr,
@@ -1214,8 +1211,7 @@
else if (!(descr->style & LBS_MULTIPLESEL) && (descr->selected_item != -1))
{
/* Set selection to new caret item */
- LISTBOX_SetSelection( wnd, descr, index, TRUE,
- (descr->style & LBS_NOTIFY) != 0 );
+ LISTBOX_SetSelection( wnd, descr, index, TRUE, FALSE );
}
}
@@ -1683,8 +1679,7 @@
{
LISTBOX_SetCaretIndex( wnd, descr, index, FALSE );
LISTBOX_SetSelection( wnd, descr, index,
- !descr->items[index].selected,
- (descr->style & LBS_NOTIFY) != 0 );
+ !descr->items[index].selected, FALSE );
}
else LISTBOX_MoveCaret( wnd, descr, index, FALSE );
}
@@ -1693,8 +1688,7 @@
LISTBOX_MoveCaret( wnd, descr, index, FALSE );
LISTBOX_SetSelection( wnd, descr, index,
(!(descr->style & LBS_MULTIPLESEL) ||
- !descr->items[index].selected),
- (descr->style & LBS_NOTIFY) != 0 );
+ !descr->items[index].selected), FALSE );
}
}
SetFocus32( wnd->hwndSelf );
@@ -1716,6 +1710,21 @@
/***********************************************************************
+ * LISTBOX_HandleLButtonUp
+ */
+static LRESULT LISTBOX_HandleLButtonUp( WND *wnd, LB_DESCR *descr )
+{
+ if (LISTBOX_Timer != LB_TIMER_NONE)
+ KillSystemTimer32( wnd->hwndSelf, LB_TIMER_ID );
+ LISTBOX_Timer = LB_TIMER_NONE;
+ if (GetCapture32() == wnd->hwndSelf) ReleaseCapture();
+ if (descr->style & LBS_NOTIFY)
+ SEND_NOTIFICATION( wnd, descr, LBN_SELCHANGE );
+ return 0;
+}
+
+
+/***********************************************************************
* LISTBOX_HandleTimer
*
* Handle scrolling upon a timer event.
@@ -1883,16 +1892,13 @@
caret = descr->nb_items - 1;
break;
case VK_SPACE:
- if (descr->style & LBS_EXTENDEDSEL)
- {
- if (!(GetKeyState(VK_SHIFT) & 0x8000))
- descr->anchor_item = descr->focus_item;
- LISTBOX_MoveCaret( wnd, descr, descr->focus_item, TRUE );
- }
+ if (descr->style & LBS_EXTENDEDSEL) caret = descr->focus_item;
else if (descr->style & LBS_MULTIPLESEL)
+ {
LISTBOX_SetSelection( wnd, descr, descr->focus_item,
!descr->items[descr->focus_item].selected,
(descr->style & LBS_NOTIFY) != 0 );
+ }
break;
}
if (caret >= 0)
@@ -1901,6 +1907,8 @@
!(GetKeyState( VK_SHIFT ) & 0x8000))
descr->anchor_item = caret;
LISTBOX_MoveCaret( wnd, descr, caret, TRUE );
+ if (descr->style & LBS_NOTIFY)
+ SEND_NOTIFICATION( wnd, descr, LBN_SELCHANGE );
}
return 0;
}
@@ -1912,11 +1920,24 @@
static LRESULT LISTBOX_HandleChar( WND *wnd, LB_DESCR *descr,
WPARAM32 wParam )
{
- INT32 index;
+ INT32 caret = -1;
char str[2] = { wParam & 0xff, '\0' };
- index = LISTBOX_FindString( wnd, descr, descr->focus_item, str, FALSE );
- if (index != LB_ERR) LISTBOX_MoveCaret( wnd, descr, index, TRUE );
+ if (descr->style & LBS_WANTKEYBOARDINPUT)
+ {
+ caret = SendMessage32A( descr->owner, WM_CHARTOITEM,
+ MAKEWPARAM(LOWORD(wParam), descr->focus_item),
+ wnd->hwndSelf );
+ if (caret == -2) return 0;
+ }
+ if (caret == -1)
+ caret = LISTBOX_FindString( wnd, descr, descr->focus_item, str, FALSE);
+ if (caret != -1)
+ {
+ LISTBOX_MoveCaret( wnd, descr, caret, TRUE );
+ if (descr->style & LBS_NOTIFY)
+ SEND_NOTIFICATION( wnd, descr, LBN_SELCHANGE );
+ }
return 0;
}
@@ -2159,8 +2180,7 @@
INT32 index = LISTBOX_FindString( wnd, descr, wParam,
(LPCSTR)lParam, FALSE );
if (index == LB_ERR) return LB_ERR;
- LISTBOX_SetSelection( wnd, descr, index, TRUE,
- (descr->style & LBS_NOTIFY) != 0 );
+ LISTBOX_SetSelection( wnd, descr, index, TRUE, FALSE );
return index;
}
@@ -2176,13 +2196,13 @@
lParam = (INT32)(INT16)lParam;
/* fall through */
case LB_SETSEL32:
- return LISTBOX_SetSelection( wnd, descr, lParam, wParam,
- (descr->style & LBS_NOTIFY) != 0 );
+ return LISTBOX_SetSelection( wnd, descr, lParam, wParam, FALSE );
case LB_SETCURSEL16:
wParam = (INT32)(INT16)wParam;
/* fall through */
case LB_SETCURSEL32:
+ if (wParam != -1) LISTBOX_MakeItemVisible( wnd, descr, wParam, TRUE );
return LISTBOX_SetSelection( wnd, descr, wParam, TRUE, FALSE );
case LB_GETSELCOUNT16:
@@ -2344,11 +2364,7 @@
return 0;
case WM_LBUTTONUP:
- if (LISTBOX_Timer != LB_TIMER_NONE)
- KillSystemTimer32( hwnd, LB_TIMER_ID );
- LISTBOX_Timer = LB_TIMER_NONE;
- if (GetCapture32() == hwnd) ReleaseCapture();
- return 0;
+ return LISTBOX_HandleLButtonUp( wnd, descr );
case WM_KEYDOWN:
return LISTBOX_HandleKeyDown( wnd, descr, wParam );
