jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed COLORREF from int to DWORD (32 bit long), so that it works also on 64bit Windows

Browse source
This commit is contained in:
enurlyx 2014-05-04 12:49:05 +02:00
commit a2692f984d
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/windows/windows.nim
View file

@ -137,7 +137,7 @@ type # WinDef.h -- Basic Windows Type Definitions
HFILE* = HANDLE HFILE* = HANDLE
HCURSOR* = HANDLE # = HICON HCURSOR* = HANDLE # = HICON
COLORREF* = int COLORREF* = DWORD
LPCOLORREF* = ptr COLORREF LPCOLORREF* = ptr COLORREF
POINT* {.final, pure.} = object POINT* {.final, pure.} = object
@ -238,7 +238,7 @@ type
CALTYPE* = int CALTYPE* = int
CALID* = int CALID* = int
CCHAR* = char CCHAR* = char
TCOLORREF* = int TCOLORREF* = COLORREF
WINT* = int32 WINT* = int32
PINTEGER* = ptr int32 PINTEGER* = ptr int32
PBOOL* = ptr WINBOOL PBOOL* = ptr WINBOOL
@ -22758,12 +22758,12 @@ proc LocalDiscard*(hlocMem: HLOCAL): HLOCAL =
# WinGDI.h # WinGDI.h
proc GetGValue*(rgb: int32): int8 = discard """proc GetGValue*(rgb: int32): int8 =
result = toU8(rgb shr 8'i32) result = toU8(rgb shr 8'i32)"""
proc RGB*(r, g, b: int): COLORREF = proc RGB*(r, g, b: int): COLORREF =
result = toU32(r) or (toU32(g) shl 8) or (toU32(b) shl 16) result = toU32(r) or (toU32(g) shl 8) or (toU32(b) shl 16)
proc RGB*(r, g, b: range[0 .. 255]): COLORREF = proc RGB*(r, g, b: range[0 .. 255]): COLORREF =
result = r or g shl 8 or b shl 16 result = toU32(r) or (toU32(g) shl 8) or (toU32(b) shl 16)
proc PALETTERGB*(r, g, b: range[0..255]): COLORREF = proc PALETTERGB*(r, g, b: range[0..255]): COLORREF =
result = 0x02000000 or RGB(r, g, b) result = 0x02000000 or RGB(r, g, b)