[Fencommits] fenfire-hs: remove deprecations now that we depend on gtk2hs

[Tuukka Hastrup]

Sat Mar 10 12:50:43 EET 2007  Tuukka Hastrup <Tuukka.Hastrup at iki.fi>
  * remove deprecations now that we depend on gtk2hs
diff -rN -u old-fenfire-hs/fenfire.cabal new-fenfire-hs/fenfire.cabal
--- old-fenfire-hs/fenfire.cabal	2007-03-10 12:50:01.000000000 +0200
+++ new-fenfire-hs/fenfire.cabal	2007-03-10 12:50:02.000000000 +0200
@@ -11,8 +11,8 @@
 Category:       User Interfaces
 Stability:      alpha
 Homepage:       http://fenfire.org/
-Build-Depends:  base, HaXml, gtk, mtl, unix, cairo, harp, template-haskell,
-                glib, network
+Build-Depends:  base, HaXml, gtk > 0.9.10, mtl, unix, cairo, harp, 
+                template-haskell, glib, network
 Data-Files:     data/logo.svg data/icon16.png
 
 Executable:     fenfire
@@ -21,7 +21,7 @@
                 GtkFixes, VanishingView, Main
 GHC-Options:    -fglasgow-exts -hide-package haskell98 -Wall 
                 -fno-warn-unused-imports -fno-warn-missing-signatures
-                -fno-warn-orphans -fno-warn-deprecations -main-is Main.main
+                -fno-warn-orphans -main-is Main.main
 Extra-Libraries: raptor
 
 Executable:     functortest
@@ -29,43 +29,40 @@
 Other-Modules:  FunctorTest, FunctorSugar
 GHC-Options:    -fglasgow-exts -hide-package haskell98 -Wall 
                 -fno-warn-unused-imports -fno-warn-missing-signatures
-                -fno-warn-orphans -fno-warn-deprecations 
-                -main-is FunctorTest.main
+                -fno-warn-orphans -main-is FunctorTest.main
 
 Executable:     vobtest
 Main-Is:        VobTest.hs
 Other-Modules:  VobTest, Vobs, Cairo, Utils, FunctorSugar
 GHC-Options:    -fglasgow-exts -hide-package haskell98 -Wall 
                 -fno-warn-unused-imports -fno-warn-missing-signatures
-                -fno-warn-orphans -fno-warn-deprecations -main-is VobTest.main
+                -fno-warn-orphans -main-is VobTest.main
 
 Executable:     frptest
 Main-Is:        FRP.hs
 Other-Modules:  FRP, Utils, FunctorSugar
 GHC-Options:    -fglasgow-exts -hide-package haskell98 -Wall 
                 -fno-warn-unused-imports -fno-warn-missing-signatures
-                -fno-warn-orphans -fno-warn-deprecations -main-is FRP.main
+                -fno-warn-orphans -main-is FRP.main
 
 Executable:     darcs2rdf
 Main-Is:        Darcs2RDF.hs
 Other-Modules:  Darcs2RDF, FunctorSugar
 GHC-Options:    -fglasgow-exts -hide-package haskell98 -Wall 
                 -fno-warn-unused-imports -fno-warn-missing-signatures
-                -fno-warn-orphans -fno-warn-deprecations 
-                -main-is Darcs2RDF.main
+                -fno-warn-orphans -main-is Darcs2RDF.main
 
 Executable:     irc2rdf
 Main-Is:        Irc2RDF.hs
 Other-Modules:  Irc2RDF
 GHC-Options:    -fglasgow-exts -hide-package haskell98 -Wall 
                 -fno-warn-unused-imports -fno-warn-missing-signatures
-                -fno-warn-orphans -fno-warn-deprecations 
-                -main-is Irc2RDF.main
+                -fno-warn-orphans -main-is Irc2RDF.main
 
 Executable:     latex2png
 Main-Is:        Latex2Png.hs
 Other-Modules:  Latex2Png
 GHC-Options:    -fglasgow-exts -hide-package haskell98 -Wall 
                 -fno-warn-unused-imports -fno-warn-missing-signatures
-                -fno-warn-orphans -fno-warn-deprecations 
-                -main-is Latex2Png.main
+                -fno-warn-orphans -main-is Latex2Png.main
+
diff -rN -u old-fenfire-hs/FRP.fhs new-fenfire-hs/FRP.fhs
--- old-fenfire-hs/FRP.fhs	2007-03-10 12:50:01.000000000 +0200
+++ new-fenfire-hs/FRP.fhs	2007-03-10 12:50:02.000000000 +0200
@@ -74,7 +74,7 @@
         let (ren, sf') = runSF sf (time' - time) (Input x y)
         writeIORef ref (time', sf')
 
-        drawable <- drawingAreaGetDrawWindow canvas
+        drawable <- widgetGetDrawWindow canvas
         renderWithDrawable drawable ren
         
         widgetQueueDraw canvas
diff -rN -u old-fenfire-hs/Vobs.fhs new-fenfire-hs/Vobs.fhs
--- old-fenfire-hs/Vobs.fhs	2007-03-10 12:50:01.000000000 +0200
+++ new-fenfire-hs/Vobs.fhs	2007-03-10 12:50:02.000000000 +0200
@@ -374,7 +374,7 @@
     
     animRef <- newIORef (mempty, Map.empty, noAnim Map.empty)
     
-    let getWH = do (cw, ch) <- drawingAreaGetSize canvas
+    let getWH = do (cw, ch) <- widgetGetSize canvas
                    return (fromIntegral cw, fromIntegral ch)
                    
         getVob = do state <- readIORef stateRef
@@ -442,7 +442,7 @@
         return True
     
     onExpose canvas $ \(Expose {}) -> do
-        drawable <- drawingAreaGetDrawWindow canvas
+        drawable <- widgetGetDrawWindow canvas
         
         (vob, _, anim) <- readIORef animRef;  time <- getTime
         let (scene, rerender) = anim time