[htoolkit-cvs] port/src/cbits/Win32 ToolBar.c,1.8,1.9

[<kr_...@us...>]

Update of /cvsroot/htoolkit/port/src/cbits/Win32
In directory sc8-pr-cvs1:/tmp/cvs-serv6900/src/cbits/Win32

Modified Files:
	ToolBar.c 
Log Message:
fix: BTNS_SHOWTEXT flag should be set only for buttons with real caption


Index: ToolBar.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/ToolBar.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ToolBar.c	12 Aug 2003 19:14:56 -0000	1.8
--- ToolBar.c	12 Aug 2003 19:46:48 -0000	1.9
***************
*** 817,822 ****
  	tbb.iBitmap   = I_IMAGENONE;
  	tbb.idCommand = btn->nCommand;
! 	tbb.fsState   = (BYTE)TBSTATE_ENABLED;
! 	tbb.fsStyle   = (BYTE)TBSTYLE_BUTTON | BTNS_SHOWTEXT;
  	tbb.dwData    = (DWORD)btn;
  	tbb.iString   = 0;
--- 817,822 ----
  	tbb.iBitmap   = I_IMAGENONE;
  	tbb.idCommand = btn->nCommand;
! 	tbb.fsState   = TBSTATE_ENABLED;
! 	tbb.fsStyle   = TBSTYLE_BUTTON;
  	tbb.dwData    = (DWORD)btn;
  	tbb.iString   = 0;
***************
*** 951,955 ****
  	TBBUTTONINFO tbbi;
  	tbbi.cbSize = sizeof(tbbi);
! 	tbbi.dwMask = TBIF_TEXT;
  	tbbi.pszText = text;
  	tbbi.cchText = strlen(text);
--- 951,956 ----
  	TBBUTTONINFO tbbi;
  	tbbi.cbSize = sizeof(tbbi);
! 	tbbi.dwMask = TBIF_TEXT | TBIF_STYLE;
! 	tbbi.fsStyle = TBSTYLE_BUTTON | ((text && *text) ? BTNS_SHOWTEXT : 0);
  	tbbi.pszText = text;
  	tbbi.cchText = strlen(text);