[Gtk2hs-commit] gtk2hs/gtk/gdk Events.hsc,1.6,1.7 GC.chs,1.4,1.5 GdkEnums.chs,1.7,1.8 Keys.chs,1.3,1.4 Pixbuf.chs,1.8,1.9

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

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

Modified Files:
	Events.hsc GC.chs GdkEnums.chs Keys.chs Pixbuf.chs 
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: GdkEnums.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gdk/GdkEnums.chs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- GdkEnums.chs	23 May 2004 15:55:36 -0000	1.7
+++ GdkEnums.chs	9 Dec 2004 18:26:01 -0000	1.8
@@ -47,7 +47,7 @@
   Flags(fromFlags,toFlags)
   ) where
 
-import LocalData((.|.))
+import Data.Bits ((.|.))
 
 class  (Enum a, Bounded a) => Flags a where
   fromFlags ::  [a] -> Int

Index: Pixbuf.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gdk/Pixbuf.chs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Pixbuf.chs	16 Jul 2004 15:13:00 -0000	1.8
+++ Pixbuf.chs	9 Dec 2004 18:26:01 -0000	1.9
@@ -89,9 +89,9 @@
 import Structs		(Rectangle(..))
 import GError		(GError(..), GErrorClass(..), GErrorDomain,
 			checkGError, checkGErrorWithCont)
-import LocalData	(unsafePerformIO)
-import Exception	(bracket)
-import LocalData	((.|.), shiftL)
+import Foreign		(unsafePerformIO)
+import Control.Exception(bracket)
+import Data.Bits	((.|.), shiftL)
 
 {#context prefix="gdk" #}
 

Index: GC.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gdk/GC.chs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- GC.chs	23 May 2004 15:55:36 -0000	1.4
+++ GC.chs	9 Dec 2004 18:26:01 -0000	1.5
@@ -65,7 +65,7 @@
 
 import Monad	(liftM, when)
 import Maybe	(fromJust, isJust)
-import Exception(handle)
+import Control.Exception (handle)
 import FFI
 
 import GObject	(makeNewGObject)

Index: Keys.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gdk/Keys.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Keys.chs	23 May 2004 15:55:36 -0000	1.3
+++ Keys.chs	9 Dec 2004 18:26:01 -0000	1.4
@@ -33,7 +33,7 @@
 
 
 import FFI
-import LocalData(unsafePerformIO)
+import Foreign (unsafePerformIO)
 
 {#context lib="libgdk" prefix ="gdk"#}
 

Index: Events.hsc
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gdk/Events.hsc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Events.hsc	23 May 2004 15:55:36 -0000	1.6
+++ Events.hsc	9 Dec 2004 18:25:45 -0000	1.7
@@ -74,7 +74,7 @@
 
 
 import FFI
-import LocalData((.&.))
+import Data.Bits ((.&.))
 import GdkEnums	(VisibilityState(..),
 		 CrossingMode(..),
 		 NotifyType(..),