[Gtk2hs-commit] gtk2hs/mogul TreeList.hs,1.10,1.11 WidgetTable.hs,1.6,1.7

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mogul
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28179/mogul

Modified Files:
	TreeList.hs WidgetTable.hs 
Log Message:
Change some import modules to use modern hierarchical modules so we no longer
need the LocalData or LocalControl modules, nor the data or lang packages.

This should still work all the way back to ghc 5.04.x, though it needs testing.


Index: WidgetTable.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/WidgetTable.hs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- WidgetTable.hs	25 May 2004 00:33:35 -0000	1.6
+++ WidgetTable.hs	9 Dec 2004 18:26:03 -0000	1.7
@@ -36,9 +36,10 @@
 import Monad	(liftM)
 import Foreign
 import FFI (foreignPtrToPtr)
-import LocalControl (MVar, newMVar, takeMVar, putMVar, readMVar)
-import LocalData  (unsafePerformIO, FiniteMap, emptyFM, addToFM, delFromFM,
-		  lookupFM, elemFM)
+import Control.Concurrent.MVar	(MVar, newMVar, takeMVar, putMVar, readMVar)
+import System.IO.Unsafe		(unsafePerformIO)
+import Data.FiniteMap		(FiniteMap, emptyFM, addToFM, delFromFM,
+				lookupFM, elemFM)
 import Object   (makeNewObject)
 import Hierarchy
 import Widget	(widgetSetName, onUnrealize)

Index: TreeList.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mogul/TreeList.hs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- TreeList.hs	25 May 2004 00:33:35 -0000	1.10
+++ TreeList.hs	9 Dec 2004 18:26:03 -0000	1.11
@@ -128,8 +128,8 @@
   -- TreeView
   treeViewGetPathAtPos)
 import qualified Gtk
-import LocalData	(IORef(..), newIORef, readIORef, writeIORef)
-import LocalControl	(throw, Exception(AssertionFailed))
+import Data.IORef		(IORef(..), newIORef, readIORef, writeIORef)
+import Control.Exception	(throw, Exception(AssertionFailed))
 
 -- | A skeleton of a 'ListStore' database.
 --