[Gtk2hs-commit] gtk2hs/gtk/treeList TreeView.chs,1.16,1.17 api.ignore,1.3,1.4

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

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

Modified Files:
	TreeView.chs api.ignore 
Log Message:
Add missing functions & fix typo bug in TreeView.chs.
Add more ignored functions.


Index: TreeView.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeView.chs,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- TreeView.chs	23 May 2004 16:16:43 -0000	1.16
+++ TreeView.chs	5 Aug 2004 14:24:27 -0000	1.17
@@ -119,6 +119,7 @@
   treeViewGetVisibleRect,
   treeViewWidgetToTreeCoords,
   treeViewTreeToWidgetCoords,
+  treeViewCreateRowDragIcon,
   treeViewGetEnableSearch,
   treeViewSetEnableSearch,
   treeViewGetSearchColumn,
@@ -149,7 +150,7 @@
 
 import General	(mkDestructor)
 import Structs	(Point, Rectangle)
-import GObject	(makeNewGObject, objectRef, objectUnref)
+import GObject	(makeNewGObject)
 import Object	(makeNewObject)
 import GList	(GList, fromGList)
 {#import Hierarchy#}
@@ -179,9 +180,8 @@
 treeViewGetModel :: TreeViewClass tv => tv -> IO (Maybe TreeModel)
 treeViewGetModel tv = do
   tmPtr <- {#call unsafe tree_view_get_model#} (toTreeView tv)
-  if tmPtr==nullPtr then return Nothing else do
-    objectRef tmPtr
-    liftM (Just . mkTreeModel) $ newForeignPtr tmPtr (objectUnref tmPtr)
+  if tmPtr==nullPtr then return Nothing else liftM Just $
+    makeNewGObject mkTreeModel (return tmPtr)
 
 -- | Set the 'TreeModel' for the current View.
 --
@@ -683,11 +683,11 @@
 treeViewGetCellArea :: TreeViewClass tv => tv -> Maybe TreePath -> 
 					   TreeViewColumn -> IO Rectangle
 treeViewGetCellArea tv Nothing tvc = alloca $ \rPtr ->
-  {#call unsafe tree_view_get_background_area#} (toTreeView tv)
+  {#call unsafe tree_view_get_cell_area#} (toTreeView tv)
     (TreePath nullForeignPtr) tvc (castPtr (rPtr :: Ptr Rectangle))
     >> peek rPtr
 treeViewGetCellArea tv (Just tp) tvc = alloca $ \rPtr -> do
-  {#call unsafe tree_view_get_background_area#} (toTreeView tv) tp
+  {#call unsafe tree_view_get_cell_area#} (toTreeView tv) tp
     tvc (castPtr (rPtr :: Ptr Rectangle)) >> peek rPtr
 
 -- | Retrieve the largest bounding box 
@@ -724,8 +724,7 @@
     (castPtr (rPtr :: Ptr Rectangle))
   peek rPtr
 
--- | Convert widget to tree pixel
--- coordinates.
+-- | Convert widget to tree pixel coordinates.
 --
 -- * See module description.
 --
@@ -737,8 +736,7 @@
   y' <- peek yPtr
   return (fromIntegral x', fromIntegral y')
 
--- | Convert tree to widget pixel
--- coordinates.
+-- | Convert tree to widget pixel coordinates.
 --
 -- * See module description.
 --
@@ -750,6 +748,14 @@
   y' <- peek yPtr
   return (fromIntegral x', fromIntegral y')
 
+-- | Creates a "Pixmap" representation of the row at the given path. This image
+-- can be used for a drag icon.
+--
+treeViewCreateRowDragIcon :: TreeViewClass tv => tv -> TreePath -> IO Pixmap
+treeViewCreateRowDragIcon tv path =
+  makeNewGObject mkPixmap $
+  {#call unsafe tree_view_create_row_drag_icon#} (toTreeView tv) path
+
 -- | Set if user can search entries.
 --
 -- * If enabled, the user can type in text which will set the cursor to
@@ -765,15 +771,13 @@
 treeViewSetEnableSearch tv es = {#call tree_view_set_enable_search#}
   (toTreeView tv) (fromBool es)
 
--- | Gets the column searched on by the
--- interactive search.
+-- | Gets the column searched on by the interactive search.
 --
 treeViewGetSearchColumn :: TreeViewClass tv => tv -> IO Int
 treeViewGetSearchColumn tv = liftM fromIntegral $
   {#call unsafe tree_view_get_search_column#} (toTreeView tv)
 
--- | Set the column searched on by
--- by the interactive search.
+-- | Set the column searched on by by the interactive search.
 --
 -- * Additionally, turns on interactive searching.
 --

Index: api.ignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/api.ignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- api.ignore	4 Aug 2004 18:42:00 -0000	1.3
+++ api.ignore	5 Aug 2004 14:24:27 -0000	1.4
@@ -74,3 +74,19 @@
 always exclude gtk_tree_view_column_cell_set_cell_data
 always exclude gtk_tree_view_column_cell_is_visible
 
+#TreeView stuff
+#varargs attributes stuff
+always exclude gtk_tree_view_insert_column_with_attributes
+
+#private to ATK
+always exclude gtk_tree_view_set_destroy_count_func
+
+#not useful
+always exclude gtk_tree_view_get_bin_window
+
+#can't bind due to memory management problems
+always exclude gtk_tree_view_get_search_equal_func
+
+#TextTag stuff
+#rather internal
+always exclude gtk_text_tag_event