[Gtk2hs-commit] gtk2hs/gtk/treeList TreeModel.chs,1.14,1.15 TreeSelection.chs,1.10,1.11 TreeView.chs,1.17,1.18

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

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

Modified Files:
	TreeModel.chs TreeSelection.chs TreeView.chs 
Log Message:
Removed support for versions of ghc pre 5.04. ghc 5.04 supports the new FFI
syntax so remove old-style "foreign export dynamic" versions.
Tested with ghc 5.04 & 5.04.3


Index: TreeView.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeView.chs,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- TreeView.chs	5 Aug 2004 14:24:27 -0000	1.17
+++ TreeView.chs	10 Aug 2004 14:51:48 -0000	1.18
@@ -429,20 +429,10 @@
 
 {#pointer TreeViewColumnDropFunc#}
 
-#if __GLASGOW_HASKELL__>=600
-
 foreign import ccall "wrapper" mkTreeViewColumnDropFunc ::
   (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
   Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc
 
-#else
-
-foreign export dynamic mkTreeViewColumnDropFunc ::
-  (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
-  Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc
-
-#endif
-
 -- | Scroll to a coordinate.
 --
 
@@ -596,20 +586,10 @@
 
 {#pointer TreeViewMappingFunc#}
 
-#if __GLASGOW_HASKELL__>=600
-
 foreign import ccall "wrapper" mkTreeViewMappingFunc ::
   (Ptr TreeView -> Ptr TreePath -> Ptr () -> IO ()) ->
   IO TreeViewMappingFunc
 
-#else
-
-foreign export dynamic mkTreeViewMappingFunc ::
-  (Ptr TreeView -> Ptr TreePath -> Ptr () -> IO ()) ->
-  IO TreeViewMappingFunc
-
-#endif
-
 -- | Check if row is expanded.
 --
 treeViewRowExpanded :: TreeViewClass tv => tv -> TreePath -> IO Bool
@@ -815,20 +795,10 @@
 
 {#pointer TreeViewSearchEqualFunc#}
 
-#if __GLASGOW_HASKELL__>=600
-
 foreign import ccall "wrapper" mkTreeViewSearchEqualFunc ::
   (Ptr TreeModel -> {#type gint#} -> CString -> Ptr TreeIter -> Ptr () ->
    IO {#type gboolean#}) -> IO TreeViewSearchEqualFunc
 
-#else
-
-foreign export dynamic mkTreeViewSearchEqualFunc ::
-  (Ptr TreeModel -> {#type gint#} -> CString -> Ptr TreeIter -> Ptr () ->
-   IO {#type gboolean#}) -> IO TreeViewSearchEqualFunc
-
-#endif
-
 -- | The user has dragged a column to another
 -- position.
 --

Index: TreeModel.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeModel.chs,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- TreeModel.chs	6 Aug 2004 01:48:03 -0000	1.14
+++ TreeModel.chs	10 Aug 2004 14:51:48 -0000	1.15
@@ -163,18 +163,9 @@
 
 {#pointer TreeModelForeachFunc#}
 
-#if __GLASGOW_HASKELL__>=600
-
 foreign import ccall "wrapper"  mkTreeModelForeachFunc ::
   (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) -> IO TreeModelForeachFunc
 
-#else
-
-foreign export dynamic mkTreeModelForeachFunc ::
-  (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt)-> IO TreeModelForeachFunc
-
-#endif
-
 -- | Returns a set of flags supported by this interface. The flags supported
 -- should not change during the lifecycle of the model.
 --

Index: TreeSelection.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeSelection.chs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- TreeSelection.chs	4 Aug 2004 18:42:00 -0000	1.10
+++ TreeSelection.chs	10 Aug 2004 14:51:48 -0000	1.11
@@ -113,18 +113,9 @@
 type TreeSelectionCB = TreePath -> IO ()
 {#pointer TreeSelectionFunc#}
 
-#if __GLASGOW_HASKELL__>=600
-
 foreign import ccall "wrapper"  mkTreeSelectionFunc ::
   (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO ())-> IO TreeSelectionFunc
 
-#else
-
-foreign export dynamic mkTreeSelectionFunc ::
-  (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO ())-> IO TreeSelectionFunc
-
-#endif
-
 -- | Retrieve the TreeView widget that this
 -- TreeSelection works on.
 --
@@ -168,18 +159,9 @@
 type TreeSelectionForeachCB = TreeIter -> IO ()
 {#pointer TreeSelectionForeachFunc#}
 
-#if __GLASGOW_HASKELL__>=600
-
 foreign import ccall "wrapper"  mkTreeSelectionForeachFunc ::
   (Ptr () -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc
 
-#else
-
-foreign export dynamic mkTreeSelectionForeachFunc ::
-  (Ptr () -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc
-
-#endif
-
 -- | Select a specific item by TreePath.
 --
 treeSelectionSelectPath :: (TreeSelectionClass ts) => ts -> TreePath -> IO ()