Update of /cvsroot/gtk2hs/gtk2hs/gtk/treeList
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv696/gtk/treeList
Modified Files:
TreeModel.chs
Log Message:
Compatability fixes for gtk-2.2 & 2.0 and for ghc-5.04.x.
Also fix a typo in TreeModel.chs which caused a linker error in apps.
Index: TreeModel.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeModel.chs,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- TreeModel.chs 4 Aug 2004 18:42:00 -0000 1.13
+++ TreeModel.chs 6 Aug 2004 01:48:03 -0000 1.14
@@ -171,7 +171,7 @@
#else
foreign export dynamic mkTreeModelForeachFunc ::
- (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)-> IO TreeModelForeachFunc
+ (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt)-> IO TreeModelForeachFunc
#endif
@@ -342,10 +342,23 @@
treeRowReferenceNew tm path = do
rowRefPtr <- throwIfNull "treeRowReferenceNew: invalid path given" $
{#call unsafe gtk_tree_row_reference_new#} (toTreeModel tm) path
- liftM TreeRowReference $ newForeignPtr rowRefPtr tree_row_reference_free
+ liftM TreeRowReference $
+ newForeignPtr rowRefPtr (tree_row_reference_free rowRefPtr)
-foreign import ccall unsafe "&tree_row_reference_free"
- tree_row_reference_free :: FinalizerPtr TreeRowReference
+#if __GLASGOW_HASKELL__>=600
+
+foreign import ccall unsafe ">k_tree_row_reference_free"
+ tree_row_reference_free' :: FinalizerPtr TreeRowReference
+
+tree_row_reference_free :: Ptr TreeRowReference -> FinalizerPtr TreeRowReference
+tree_row_reference_free _ = tree_row_reference_free'
+
+#else
+
+foreign import ccall unsafe "gtk_tree_row_reference_free"
+ tree_row_reference_free :: Ptr TreeRowReference -> IO ()
+
+#endif
-- | Returns a path that the row reference currently points to, or @Nothing@ if
-- the path pointed to is no longer valid.
|