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

Merge pull request #1224 from Varriount/enurlyx-Windows

Browse source 
Manual merge of Enurlyx windows
This commit is contained in:
Varriount 2014-05-24 08:59:08 -04:00
commit 38e550de0e
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/windows/windows.nim
View file

@ -62,7 +62,7 @@ type # BaseTsd.h -- Type definitions for the basic sized types
type # WinDef.h -- Basic Windows Type Definitions type # WinDef.h -- Basic Windows Type Definitions
# BaseTypes # BaseTypes
UINT = int32 WINUINT* = int32
ULONG* = int ULONG* = int
PULONG* = ptr int PULONG* = ptr int
USHORT* = int16 USHORT* = int16
@ -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
@ -19683,7 +19683,7 @@ proc SetSysColors*(cElements: int32, lpaElements: var wINT,
dynlib: "user32", importc: "SetSysColors".} dynlib: "user32", importc: "SetSysColors".}
proc DrawFocusRect*(hDC: HDC, lprc: var RECT): WINBOOL{.stdcall, proc DrawFocusRect*(hDC: HDC, lprc: var RECT): WINBOOL{.stdcall,
dynlib: "user32", importc: "DrawFocusRect".} dynlib: "user32", importc: "DrawFocusRect".}
proc FillRect*(hDC: HDC, lprc: RECT, hbr: HBRUSH): int32{.stdcall, proc FillRect*(hDC: HDC, lprc: var RECT, hbr: HBRUSH): int32{.stdcall,
dynlib: "user32", importc: "FillRect".} dynlib: "user32", importc: "FillRect".}
proc FrameRect*(hDC: HDC, lprc: var RECT, hbr: HBRUSH): int32{.stdcall, proc FrameRect*(hDC: HDC, lprc: var RECT, hbr: HBRUSH): int32{.stdcall,
dynlib: "user32", importc: "FrameRect".} dynlib: "user32", importc: "FrameRect".}
@ -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)