reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-18 03:48:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed ugly disabled controls and black background in Write and Lotus

Browse Source 
Notes.
This commit is contained in:
Pavel Roskin 1999-04-15 15:52:59 +00:00 committed by Alexandre Julliard
parent 026f705dbc
commit 6f01462b8b
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/x11drv/bitblt.c
View File

@ -1293,7 +1293,7 @@ static BOOL BITBLT_InternalStretchBlt( DC *dcDst, INT xDst, INT yDst,
{
XSetFunction( display, physDevDst->gc, GXcopy );
XSetForeground( display, physDevDst->gc,
X11DRV_PALETTE_PaletteToXPixel[X11DRV_DevCaps.sizePalette - 1]);
WhitePixelOfScreen( X11DRV_GetXScreen() ));
XSetFillStyle( display, physDevDst->gc, FillSolid );
}
XFillRectangle( display, physDevDst->drawable, physDevDst->gc,

6
graphics/x11drv/palette.c
View File

@ -88,6 +88,7 @@ static void X11DRV_PALETTE_ComputeShifts(unsigned long maskbits, int *shift, int
static void X11DRV_PALETTE_FillDefaultColors(void);
static void X11DRV_PALETTE_FormatSystemPalette(void);
static BOOL X11DRV_PALETTE_CheckSysColor(COLORREF c);
static int X11DRV_PALETTE_LookupSystemXPixel(COLORREF col);
/***********************************************************************
* COLOR_Init
@ -788,7 +789,7 @@ int X11DRV_PALETTE_ToPhysical( DC *dc, COLORREF color )
/***********************************************************************
* X11DRV_PALETTE_LookupSystemXPixel
*/
int X11DRV_PALETTE_LookupSystemXPixel(COLORREF col)
static int X11DRV_PALETTE_LookupSystemXPixel(COLORREF col)
{
int i, best = 0, diff = 0x7fffffff;
int size = X11DRV_DevCaps.sizePalette;
@ -955,6 +956,9 @@ int X11DRV_PALETTE_UpdateMapping(PALETTEOBJ *palPtr)
{
int i, index, realized = 0;
if (!X11DRV_DevCaps.sizePalette)
return 0;
for( i = 0; i < 20; i++ )
{
index = X11DRV_PALETTE_LookupSystemXPixel(*(COLORREF*)(palPtr->logpalette.palPalEntry + i));

1
include/x11drv.h
View File

@ -286,7 +286,6 @@ extern void X11DRV_PALETTE_Cleanup(void);
extern COLORREF X11DRV_PALETTE_ToLogical(int pixel);
extern int X11DRV_PALETTE_ToPhysical(struct tagDC *dc, COLORREF color);
extern int X11DRV_PALETTE_LookupSystemXPixel(COLORREF col);
extern struct tagPALETTE_DRIVER X11DRV_PALETTE_Driver;

2
windows/x11drv/main.c
View File

@ -125,6 +125,8 @@ BOOL X11DRV_USER_Initialize(void)
X11DRV_USER_ParseOptions( Options.argc, Options.argv );
X11DRV_USER_Create();
X11DRV_USER_SaveSetup();
return TRUE;
}
/***********************************************************************