Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 03:46:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor fixes

Browse source 
svn path=/trunk/; revision=7295
This commit is contained in:
Thomas Bluemel 2003-12-28 17:22:16 +00:00
parent b4c2add1d1
commit 4a8eb78729
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/user32/include/resource.h
View file

@ -5,8 +5,6 @@
* PURPOSE: Definition of resource ids * PURPOSE: Definition of resource ids
*/ */
#define DF_HATCH 30000
#define IDS_ERROR (2) #define IDS_ERROR (2)
#define IDS_OK (800) #define IDS_OK (800)
#define IDS_CANCEL (801) #define IDS_CANCEL (801)

1
reactos/lib/user32/include/user32.h
View file

@ -26,6 +26,7 @@ typedef struct _THRDCARETINFO
BYTE Showing; BYTE Showing;
} THRDCARETINFO, *PTHRDCARETINFO; } THRDCARETINFO, *PTHRDCARETINFO;
VOID CreateFrameBrushes(VOID);
VOID DeleteFrameBrushes(VOID); VOID DeleteFrameBrushes(VOID);
void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo); void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo);

1
reactos/lib/user32/misc/dllmain.c
View file

@ -107,6 +107,7 @@ DllMain(
hProcessHeap = RtlGetProcessHeap(); hProcessHeap = RtlGetProcessHeap();
Init(); Init();
InitThread(); InitThread();
CreateFrameBrushes();
break; break;
case DLL_THREAD_ATTACH: case DLL_THREAD_ATTACH:
InitThread(); InitThread();

BIN
reactos/lib/user32/resources/df_hatch.bmp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 94 B

1
reactos/lib/user32/user32.rc
View file

@ -82,7 +82,6 @@ END
OBM_CHECKBOXES BITMAP "resources/obm_checkboxes.bmp" OBM_CHECKBOXES BITMAP "resources/obm_checkboxes.bmp"
OBM_CLOSE BITMAP "resources/obm_close.bmp" OBM_CLOSE BITMAP "resources/obm_close.bmp"
OBM_COMBO BITMAP "resources/obm_combo.bmp" OBM_COMBO BITMAP "resources/obm_combo.bmp"
DF_HATCH BITMAP "resources/df_hatch.bmp"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //

9
reactos/lib/user32/windows/paint.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: paint.c,v 1.19 2003/12/08 18:21:24 navaraf Exp $ /* $Id: paint.c,v 1.20 2003/12/28 17:22:16 weiden Exp $
* *
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/input.c * FILE: lib/user32/windows/input.c
@ -36,11 +36,12 @@
static HBRUSH FrameBrushes[13]; static HBRUSH FrameBrushes[13];
static HBITMAP hHatch; static HBITMAP hHatch;
const DWORD HatchBitmap[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA};
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
static VOID VOID
CreateFrameBrushes() CreateFrameBrushes(VOID)
{ {
FrameBrushes[0] = CreateSolidBrush(RGB(0,0,0)); FrameBrushes[0] = CreateSolidBrush(RGB(0,0,0));
FrameBrushes[1] = CreateSolidBrush(RGB(0,0,128)); FrameBrushes[1] = CreateSolidBrush(RGB(0,0,128));
@ -54,7 +55,7 @@ CreateFrameBrushes()
FrameBrushes[9] = CreateSolidBrush(RGB(58,110,165)); FrameBrushes[9] = CreateSolidBrush(RGB(58,110,165));
FrameBrushes[10] = CreateSolidBrush(RGB(64,64,64)); FrameBrushes[10] = CreateSolidBrush(RGB(64,64,64));
FrameBrushes[11] = CreateSolidBrush(RGB(255,255,225)); FrameBrushes[11] = CreateSolidBrush(RGB(255,255,225));
hHatch = LoadBitmapW(NULL,MAKEINTRESOURCEW(DF_HATCH)); hHatch = CreateBitmap(8, 8, 1, 1, HatchBitmap);
FrameBrushes[12] = CreatePatternBrush(hHatch); FrameBrushes[12] = CreatePatternBrush(hHatch);
} }