Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 13:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add STOCK_LAST, update stock objects.

Browse source 
svn path=/trunk/; revision=30075
This commit is contained in:
James Tabor 2007-11-02 22:14:45 +00:00
parent 7783b645a2
commit 64fe695591
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/win32/gdi32/include/gdi32p.h
View file

@ -28,7 +28,6 @@ typedef INT
#define METAFILE_MEMORY 1 #define METAFILE_MEMORY 1
#define METAFILE_DISK 2 #define METAFILE_DISK 2
#define STOCK_LAST 19
#define DEFAULT_BITMAP (STOCK_LAST+1) #define DEFAULT_BITMAP (STOCK_LAST+1)
#define NB_STOCK_OBJECTS (STOCK_LAST+2) #define NB_STOCK_OBJECTS (STOCK_LAST+2)

7
reactos/include/psdk/wingdi.h
View file

@ -816,6 +816,13 @@ extern "C" {
#define DC_BRUSH 18 #define DC_BRUSH 18
#define DC_PEN 19 #define DC_PEN 19
#endif #endif
#if (_WIN32_WINNT >= 0x0500)
#define STOCK_LAST 19
#elif (WINVER >= 0x0400)
#define STOCK_LAST 17
#else
#define STOCK_LAST 16
#endif
#define SYSPAL_NOSTATIC 2 #define SYSPAL_NOSTATIC 2
#define SYSPAL_STATIC 1 #define SYSPAL_STATIC 1
#define SYSPAL_ERROR 0 #define SYSPAL_ERROR 0

4
reactos/subsystems/win32/win32k/objects/stockobj.c
View file

@ -107,7 +107,7 @@ static LOGFONTW DefaultGuiFont =
{ 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans
#define NB_STOCK_OBJECTS (DEFAULT_GUI_FONT + 1) #define NB_STOCK_OBJECTS (STOCK_LAST + 1)
static HGDIOBJ StockObjects[NB_STOCK_OBJECTS]; static HGDIOBJ StockObjects[NB_STOCK_OBJECTS];
@ -124,6 +124,7 @@ CreateStockObjects(void)
/* Create GDI Stock Objects from the logical structures we've defined */ /* Create GDI Stock Objects from the logical structures we've defined */
StockObjects[WHITE_BRUSH] = IntGdiCreateSolidBrush(RGB(255,255,255)); StockObjects[WHITE_BRUSH] = IntGdiCreateSolidBrush(RGB(255,255,255));
StockObjects[DC_BRUSH] = IntGdiCreateSolidBrush(RGB(255,255,255));
StockObjects[LTGRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(192,192,192)); StockObjects[LTGRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(192,192,192));
StockObjects[GRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(128,128,128)); StockObjects[GRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(128,128,128));
StockObjects[DKGRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(64,64,64)); StockObjects[DKGRAY_BRUSH] = IntGdiCreateSolidBrush(RGB(64,64,64));
@ -132,6 +133,7 @@ CreateStockObjects(void)
StockObjects[WHITE_PEN] = IntGdiExtCreatePen(WhitePen.lopnStyle, WhitePen.lopnWidth.x, BS_SOLID, WhitePen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); StockObjects[WHITE_PEN] = IntGdiExtCreatePen(WhitePen.lopnStyle, WhitePen.lopnWidth.x, BS_SOLID, WhitePen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL);
StockObjects[BLACK_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); StockObjects[BLACK_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL);
StockObjects[DC_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL);
StockObjects[NULL_PEN] = IntGdiExtCreatePen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); StockObjects[NULL_PEN] = IntGdiExtCreatePen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL);
(void) TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]); (void) TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]);