[Gtk2hs-commit] gtk2hs/gtk/layout Alignment.chs,1.2,1.3 AspectFrame.chs,1.3,1.4 HBox.chs,1.3,1.4 HPaned.chs,1.3,1.4 Layout.chs,1.4,1.5 Notebook.chs,1.4,1.5 Table.chs,1.3,1.4 VBox.chs,1.3,1.4 VPaned.chs,1.3,1.4

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/layout
In directory sc8-pr-cvs1:/tmp/cvs-serv25460/gtk/layout

Modified Files:
	Alignment.chs AspectFrame.chs HBox.chs HPaned.chs Layout.chs 
	Notebook.chs Table.chs VBox.chs VPaned.chs 
Log Message:
Make compile with GHC
6.00. There are two major changes in the FFI which made me
separate everything that has to do with Foreign and Foreign.C into
a new file called general/FFI.hs. The file UTFCForeign.hs is now
obsolete as its string conversion functions are now in FFI.hs. The
nullForeignPtr function is also located here. All files now import
FFI instead of Foreign and UTFCForeign. The major changes are:
newForeignPtr now takes a pointer to a C function as
finalizer. Every destructor function is now defined differently
depending on whether the new GHC is used or not. In particular
there is now a function called free :: Ptr a -> IO () imported
from the Foreign library. In addition to that I defined a function
foreignFree which can be used as finalizer to a C data
structure. It is equivalent to free if GHC version <=5.04 is
used. The second change is that ForeignPtr are no longer accepted
as arguments to foreign calls. This change is mainly reflected in
c2hs, but also in some files which directly called functions.



Index: Alignment.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/Alignment.chs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Alignment.chs	24 May 2002 09:43:25 -0000	1.2
+++ Alignment.chs	9 Jul 2003 22:42:44 -0000	1.3
@@ -36,8 +36,8 @@
   ) where
 
 import Monad	(liftM)
-import Foreign
-import UTFCForeign
+import FFI
+
 import Object	(makeNewObject)
 {#import Hierarchy#}
 {#import Signal#}

Index: AspectFrame.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/AspectFrame.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- AspectFrame.chs	5 Aug 2002 16:41:34 -0000	1.3
+++ AspectFrame.chs	9 Jul 2003 22:42:44 -0000	1.4
@@ -46,8 +46,8 @@
 
 import Monad	(liftM)
 import Maybe	(isNothing)
-import Foreign
-import UTFCForeign
+import FFI
+
 import Object	(makeNewObject)
 {#import Hierarchy#}
 {#import Signal#}

Index: HBox.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/HBox.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- HBox.chs	5 Aug 2002 16:41:34 -0000	1.3
+++ HBox.chs	9 Jul 2003 22:42:44 -0000	1.4
@@ -37,8 +37,8 @@
   ) where
 
 import Monad	(liftM)
-import Foreign
-import UTFCForeign
+import FFI
+
 import Object	(makeNewObject)
 {#import Hierarchy#}
 {#import Signal#}

Index: HPaned.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/HPaned.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- HPaned.chs	5 Aug 2002 16:41:34 -0000	1.3
+++ HPaned.chs	9 Jul 2003 22:42:44 -0000	1.4
@@ -35,8 +35,8 @@
   ) where
 
 import Monad	(liftM)
-import Foreign
-import UTFCForeign
+import FFI
+
 import Object	(makeNewObject)
 {#import Hierarchy#}
 {#import Signal#}

Index: Layout.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/Layout.chs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Layout.chs	8 Nov 2002 10:39:21 -0000	1.4
+++ Layout.chs	9 Jul 2003 22:42:44 -0000	1.5
@@ -46,10 +46,9 @@
 
 import Maybe	(fromMaybe)
 import Monad	(liftM)
-import Foreign
-import UTFCForeign
+import FFI
+
 import Object	(makeNewObject)
-import Structs	(nullForeignPtr)
 {#import Hierarchy#}
 {#import Signal#}
 

Index: Notebook.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/Notebook.chs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Notebook.chs	3 Jul 2003 05:19:36 -0000	1.4
+++ Notebook.chs	9 Jul 2003 22:42:44 -0000	1.5
@@ -81,8 +81,8 @@
 
 import Monad	(liftM)
 import Maybe	(maybe)
-import Foreign
-import UTFCForeign
+import FFI
+
 import Object	(makeNewObject)
 {#import Hierarchy#}
 {#import Signal#}

Index: Table.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/Table.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Table.chs	20 Jun 2002 14:13:05 -0000	1.3
+++ Table.chs	9 Jul 2003 22:42:44 -0000	1.4
@@ -45,8 +45,8 @@
   ) where
 
 import Monad	(liftM)
-import Foreign
-import UTFCForeign
+import FFI
+
 import Object	(makeNewObject)
 {#import Hierarchy#}
 {#import Signal#}

Index: VBox.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/VBox.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- VBox.chs	5 Aug 2002 16:41:34 -0000	1.3
+++ VBox.chs	9 Jul 2003 22:42:44 -0000	1.4
@@ -38,8 +38,8 @@
   ) where
 
 import Monad	(liftM)
-import Foreign
-import UTFCForeign
+import FFI
+
 import Object	(makeNewObject)
 {#import Hierarchy#}
 {#import Signal#}

Index: VPaned.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/VPaned.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- VPaned.chs	5 Aug 2002 16:41:34 -0000	1.3
+++ VPaned.chs	9 Jul 2003 22:42:44 -0000	1.4
@@ -35,8 +35,8 @@
   ) where
 
 import Monad	(liftM)
-import Foreign
-import UTFCForeign
+import FFI
+
 import Object	(makeNewObject)
 {#import Hierarchy#}
 {#import Signal#}