Merge branch 'master' of github.com:Araq/Nimrod

lib/impure/graphics.nim

@@ -360,7 +360,7 @@ proc drawEllipse*(sur: PSurface, CX, CY, XRadius, YRadius: Natural,
   ## of the ellipse.
   var 
     X, Y: Natural
-    XChange, YChange: Natural
+    XChange, YChange: Int
     EllipseError: Natural
     TwoASquare, TwoBSquare: Natural
     StoppingX, StoppingY: Natural
@@ -501,6 +501,7 @@ if sdl_ttf.Init() < 0: raiseEGraphics()
 
 when isMainModule:
   var surf = newScreenSurface(800, 600)
+
   surf.fillSurface(colWhite)
 
   # Draw the shapes
@@ -545,6 +546,8 @@ when isMainModule:
       if evk.keysym.sym == SDL.K_LEFT:
         surf.drawHorLine(395, 300, 50, colBlack)
         echo("Drawing")
+      elif evk.keysym.sym == SDL.K_ESCAPE:
+        break
       else:
         echo(evk.keysym.sym)
     of SDL.MOUSEBUTTONDOWN:

lib/wrappers/sdl/sdl.nim

@@ -270,6 +270,7 @@
 #
 
 {.deadCodeElim: on.}
+import unsigned
 when defined(windows): 
   const 
     LibName = "SDL.dll"
@@ -1807,7 +1808,7 @@ proc ListModes*(format: PPixelFormat, flags: int32): PPSDL_Rect{.cdecl,
   #  applications that redraw the entire screen on every update.
   #
   #  This function returns the video framebuffer surface, or NULL if it fails.
-proc SetVideoMode*(width, height, bpp: int, flags: int32): PSurface{.cdecl, 
+proc SetVideoMode*(width, height, bpp: int, flags: uint32): PSurface{.cdecl, 
     importc: "SDL_SetVideoMode", dynlib: LibName.}
   # Makes sure the given list of rectangles is updated on the given screen.
   #  If 'x', 'y', 'w' and 'h' are all 0, SDL_UpdateRect will update the entire