GeBoP 1.7.1 → 1.7.2

raw patch · 5 files changed

+22/−13 lines, 5 filesdep ~base

Dependency ranges changed: base

Files

• GUI.hs +7/−7
• GeBoP.cabal +3/−3
• Nim.hs +1/−1
• Tools.hs +2/−2
• changelog.txt +9/−0

@@ -14,7 +14,7 @@ import List
 
 version :: String
-version = "1.7.1" 
+version = "1.7.2" 
 
 gui :: [GeneralGame] -> IO ()
 gui games = do
@@ -313,12 +313,12 @@     startClock = do t <- getTree
                     v <- sliderGetValue $ ss !!! player t
                     let int = 1000 * 2 ^ v
-                    timerStart clock int True
+                    _ <- timerStart clock int True
                     info "clock started"
                     
     next :: Int -> IO ()
     next n = do t <- getTree
-                updateTree (shear n)
+                _ <- updateTree (shear n)
                 u <- getTree
                 b <- varGet varb
                 bRefresh b
@@ -344,7 +344,7 @@                js <- randomList
                let p' = path followcombination js t
 --{               let p = path followbest js t
-               updateTree $ step p'
+               _ <- updateTree $ step p'
                u <- getTree
 
                when (val t /= val u) $ sequence_ $ map repaint ps
@@ -744,7 +744,7 @@   d <- dialog w [text := "Help"]
   -- w <- htmlWindowCreate d (-1) (rect (point 0 0) (size 640 480)) 0 []
   w' <- htmlWindowCreate d (-1) (rect (point 0 0) (Size 640 480)) 0 []
-  htmlWindowLoadPage w' f
+  _  <- htmlWindowLoadPage w' f
   set d [layout := widget w', visible := True]
   return ()
 
@@ -770,7 +770,7 @@   bmp    <- bitmapCreateLoad ("images\\" ++ name' ++      ".bmp") wxBITMAP_TYPE_ANY
   mskbmp <- bitmapCreateLoad ("images\\" ++ name' ++ "_mask.bmp") wxBITMAP_TYPE_ANY 
   bitmapSetDepth mskbmp 1
-  imageListAddBitmap il bmp mskbmp
+  _ <- imageListAddBitmap il bmp mskbmp
   return ()
 
 bitmapHighImageList :: ImageList () -> String -> IO ()
@@ -778,5 +778,5 @@   bmp    <- bitmapCreateLoad ("images\\high_" ++ name' ++      ".bmp") wxBITMAP_TYPE_ANY
   mskbmp <- bitmapCreateLoad ("images\\"      ++ name' ++ "_mask.bmp") wxBITMAP_TYPE_ANY 
   bitmapSetDepth mskbmp 1
-  imageListAddBitmap il bmp mskbmp
+  _ <- imageListAddBitmap il bmp mskbmp
   return ()

@@ -3,7 +3,7 @@ Description: 
   The games: Ataxx, Bamp, Halma, Hez, Kram, Nim, Reversi, TicTacToe, and Zenix
 Homepage:       http://www.haskell.org/haskellwiki/GeBoP
-Version:        1.7.1
+Version:        1.7.2
 License:        BSD3
 License-file:   LICENSE.txt
 Author:         Maarten Löffler
@@ -12,7 +12,7 @@ Cabal-Version:  >= 1.2
 Build-type:     Simple
 Category:       Game
-Tested-with:    GHC == 6.10.4
+Tested-with:    GHC == 6.10.4, GHC == 6.12.1, GHC == 6.12.3
 Extra-Source-Files:
                 changelog.txt
                 readme.txt,
@@ -110,7 +110,7 @@ 
 Executable gebop
   Build-Depends:
-                base < 3.1, 
+                base < 5, 
                 wxcore >= 0.11 && < 0.13,
                 wx >= 0.11 && < 0.13,
                 haskell98 < 1.1, 

@@ -7,7 +7,7 @@ 
 import Game
 import Graphics.UI.WX
-import Graphics.UI.WXCore
+-- import Graphics.UI.WXCore
 import Tools
 
 data Nim = Nim Int deriving (Show, Eq)

@@ -133,7 +133,7 @@                return w
 
 send :: Wire -> IO ()
-send w = do timerStart w 1 True
+send w = do _ <- timerStart w 1 True
             return ()
 
 wait :: Window a -> Int -> IO () -> IO ()
@@ -225,4 +225,4 @@   in rectBetween (pt (min x x_) (min y y_)) (pt (max r r_) (max b b_))
 
 (|#|) :: Rect -> Rect -> Rect
-(|#|) = bounding+(|#|) = bounding

@@ -1,12 +1,21 @@ 
+2010-10-20
+
+Version 1.7.2
+ - Increased the maximum version of base to < 5 .
+
+
 2009-11-14 
+
 Version 1.7.1
  - Added -Wall flag in the CABAL file 
  - Solved all compiler warnings.
  - Increased the maximum version of wx and wxcore to < 0.13 .
  - Added the file changelog.txt
 
+
 2009-10-29 
+
 Version 1.7
  - Adapted to wxWidgets 2.8.9 / wxHaskell 0.11.1.2 
  - Cabalized