user32/listbox: Remove some unnecessary differences to the comctl32 version.
Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
0beea9f474
commit
6a421988df
|
@ -87,7 +87,7 @@ typedef struct
|
|||
BOOL in_focus;
|
||||
HFONT font; /* Current font */
|
||||
LCID locale; /* Current locale for string comparisons */
|
||||
LPHEADCOMBO lphc; /* ComboLBox */
|
||||
HEADCOMBO *lphc; /* ComboLBox */
|
||||
} LB_DESCR;
|
||||
|
||||
|
||||
|
@ -806,6 +806,7 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL
|
|||
SetLastError(ERROR_INVALID_INDEX);
|
||||
return LB_ERR;
|
||||
}
|
||||
|
||||
if (HAS_STRINGS(descr))
|
||||
{
|
||||
WCHAR *str = get_item_string(descr, index);
|
||||
|
@ -840,7 +841,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL
|
|||
return LB_ERR;
|
||||
}
|
||||
__ENDTRY
|
||||
} else {
|
||||
} else
|
||||
{
|
||||
if (buffer)
|
||||
*((ULONG_PTR *)buffer) = get_item_data(descr, index);
|
||||
len = sizeof(ULONG_PTR);
|
||||
|
@ -2600,7 +2602,7 @@ static BOOL LISTBOX_Destroy( LB_DESCR *descr )
|
|||
LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode )
|
||||
{
|
||||
LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 );
|
||||
LPHEADCOMBO lphc = 0;
|
||||
HEADCOMBO *lphc = NULL;
|
||||
LRESULT ret;
|
||||
|
||||
if (!descr)
|
||||
|
|
Loading…
Reference in New Issue