diff options
author | Andreas Rumpf <rumpf_a@web.de> | 2014-07-15 01:42:19 +0200 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2014-07-15 01:42:19 +0200 |
commit | 18ded6c23d72cd21fa0aa10ff61dc6f9af40832c (patch) | |
tree | 5d681c9835f01019e8ae83e14c0cd49d1a6c0d38 /lib/wrappers/pdcurses.nim | |
parent | 687a1b7de4c006750274fb046a10f08d38c22f5a (diff) | |
parent | 41bb0bf9dcccdfcebdb0f823fea8b2853b89ea4e (diff) | |
download | Nim-18ded6c23d72cd21fa0aa10ff61dc6f9af40832c.tar.gz |
Merge pull request #1363 from Araq/devel
Merge devel into master
Diffstat (limited to 'lib/wrappers/pdcurses.nim')
-rw-r--r-- | lib/wrappers/pdcurses.nim | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/wrappers/pdcurses.nim b/lib/wrappers/pdcurses.nim index f014c5e9c..a53289bce 100644 --- a/lib/wrappers/pdcurses.nim +++ b/lib/wrappers/pdcurses.nim @@ -554,14 +554,12 @@ template BUTTON_CHANGED*(x: expr): expr = template BUTTON_STATUS*(x: expr): expr = (Mouse_status.button[(x) - 1]) -template ACS_PICK*(w, n: expr): expr = - (cast[int32](w) or A_ALTCHARSET) +template ACS_PICK*(w, n: expr): expr = int32(w) or A_ALTCHARSET -template KEY_F*(n: expr): expr = - (KEY_F0 + (n)) +template KEY_F*(n: expr): expr = KEY_F0 + n template COLOR_PAIR*(n: expr): expr = - ((cast[cunsignedlong]((n)) shl COLOR_SHIFT) and A_COLOR) + ((cunsignedlong(n) shl COLOR_SHIFT) and A_COLOR) template PAIR_NUMBER*(n: expr): expr = (((n) and A_COLOR) shr COLOR_SHIFT) |