Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-03 16:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[User32]

Browse source 
- Add support for LB_GETLISTBOXINFO and LBS_NODATA. Fix unknown wide char in draw.c.

svn path=/trunk/; revision=56837
This commit is contained in:
James Tabor 2012-07-05 21:34:16 +00:00
parent 1cf37c2465
commit f23fd581a7
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/win32ss/user/user32/controls/listbox.c
View file

@ -27,9 +27,9 @@
* If you discover missing features, or bugs, please note them below. * If you discover missing features, or bugs, please note them below.
* *
* TODO: * TODO:
* - GetListBoxInfo() * - GetListBoxInfo() ReactOS
* - LB_GETLISTBOXINFO * - LB_GETLISTBOXINFO ReactOS
* - LBS_NODATA * - LBS_NODATA ReactOS
*/ */
#include <user32.h> #include <user32.h>
@ -2523,6 +2523,14 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc )
if (descr->style & LBS_EXTENDEDSEL) descr->style |= LBS_MULTIPLESEL; if (descr->style & LBS_EXTENDEDSEL) descr->style |= LBS_MULTIPLESEL;
if (descr->style & LBS_MULTICOLUMN) descr->style &= ~LBS_OWNERDRAWVARIABLE; if (descr->style & LBS_MULTICOLUMN) descr->style &= ~LBS_OWNERDRAWVARIABLE;
if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT; if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT;
//// ReactOS
/* A no-data list box must also have the LBS_OWNERDRAWFIXED style, but must
not have the LBS_SORT or LBS_HASSTRINGS style. */
if ( descr->style & LBS_NODATA &&
(!(descr->style & LBS_OWNERDRAWFIXED) || descr->style & (LBS_HASSTRINGS|LBS_SORT) ) )
descr->style &= ~LBS_NODATA;
////
descr->item_height = LISTBOX_SetFont( descr, 0 ); descr->item_height = LISTBOX_SetFont( descr, 0 );
if (descr->style & LBS_OWNERDRAWFIXED) if (descr->style & LBS_OWNERDRAWFIXED)
@ -3001,9 +3009,11 @@ LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg,
LISTBOX_RepaintItem( descr, descr->focus_item, ODA_FOCUS ); LISTBOX_RepaintItem( descr, descr->focus_item, ODA_FOCUS );
return LB_OKAY; return LB_OKAY;
case LB_GETLISTBOXINFO: case LB_GETLISTBOXINFO: //// ReactOS
FIXME("LB_GETLISTBOXINFO: stub!\n"); if (descr->style & LBS_MULTICOLUMN)
return 0; return descr->column_width;
else
return descr->nb_items;
case WM_DESTROY: case WM_DESTROY:
return LISTBOX_Destroy( descr ); return LISTBOX_Destroy( descr );

2
reactos/win32ss/user/user32/windows/draw.c
View file

@ -1,4 +1,4 @@
/* /*
* ReactOS User32 Library * ReactOS User32 Library
* - Various drawing functions * - Various drawing functions
* *