gtk2hs-commit — Mailing list for Darcs commit messages.

[Gtk2hs-commit] gtk2hs/mk config.mk.in,1.27,1.28

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

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30221/mk

Modified Files:
	config.mk.in 
Log Message:
Drop support for ghc 5.02.x, the minimum version required is now 5.04.x


Index: config.mk.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/config.mk.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- config.mk.in	4 Aug 2004 18:46:32 -0000	1.27
+++ config.mk.in	6 Aug 2004 01:28:18 -0000	1.28
@@ -141,8 +141,6 @@
 
 MULTIPLE_CHS	= @MULTIPLE_CHS@
 
-NEW_MODULE_SYS  = @NEW_MODULE_SYSTEM@
-
 LOCALPKGCONF	= @LOCALPKGCONF@
 
 HSTOOLFLAGS	= $(filter -H%,$(HC_FLAGS)) -M350m

[Gtk2hs-commit] gtk2hs/gtk/multiline TextTag.chs,1.6,1.7 TextTagTable.chs,1.6,1.7 TextView.chs,1.11,1.12

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

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

Modified Files:
	TextTag.chs TextTagTable.chs TextView.chs 
Log Message:
Add missing functions & fix typo bug in TreeView.chs.
Add more ignored functions.


Index: TextView.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/multiline/TextView.chs,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- TextView.chs	23 May 2004 16:09:08 -0000	1.11
+++ TextView.chs	5 Aug 2004 14:24:28 -0000	1.12
@@ -30,8 +30,6 @@
 --
 -- * If PangoTabArray is bound: do textViewSetTabs and textViewGetTabs
 --
--- * If TextTags are bound: do textViewGetDefaultAttributes
---
 module TextView(
   TextView,
   TextViewClass,
@@ -47,6 +45,7 @@
   textViewNew,
   textViewNewWithBuffer,
   textViewSetBuffer,
+  textViewGetBuffer,
   textViewScrollToMark,
   textViewScrollToIter,
   textViewScrollMarkOnscreen,
@@ -67,6 +66,7 @@
   textViewBackwardDisplayLineEnd,
   textViewForwardDisplayLineStart,
   textViewBackwardDisplayLineStart,
+  textViewStartsDisplayLine,
   textViewMoveVisually,
   textViewAddChildAtAnchor,
   textChildAnchorNew,
@@ -94,6 +94,7 @@
   textViewGetRightMargin,
   textViewSetIndent,
   textViewGetIndent,
+  textViewGetDefaultAttributes,
   onCopyClipboard,
   afterCopyClipboard,
   onCutClipboard,
@@ -127,6 +128,7 @@
 {#import Hierarchy#}
 {#import Signal#}
 {#import TextIter#}
+{#import TextTag#}
 import Enums (TextWindowType(..), DeleteType(..), DirectionType(..),
 	      Justification(..), MovementStep(..), WrapMode(..))
 import GList	(fromGList)
@@ -151,12 +153,17 @@
 textViewNewWithBuffer tb = makeNewGObject mkTextView $ liftM castPtr $
   {#call unsafe text_view_new_with_buffer#} tb
 
--- | Set the 'TextBuffer' for a given
--- 'TextView' widget.
+-- | Set the 'TextBuffer' for a given 'TextView' widget.
 --
 textViewSetBuffer :: TextViewClass tv => tv -> TextBuffer -> IO ()
 textViewSetBuffer tv tb = 
-  {#call unsafe text_view_set_buffer#} (toTextView tv) tb
+  {#call text_view_set_buffer#} (toTextView tv) tb
+
+-- | Returns the 'TextBuffer' being displayed by this text view.
+--
+textViewGetBuffer :: TextViewClass tv => tv -> IO TextBuffer
+textViewGetBuffer tv = makeNewGObject mkTextBuffer $
+  {#call unsafe text_view_get_buffer#} (toTextView tv)
 
 -- | Scroll to the position of the supplied
 -- 'TextMark'.
@@ -377,8 +384,7 @@
   {#call unsafe text_view_get_border_window_size#} (toTextView tv) 
   ((fromIntegral.fromEnum) wt)
 
--- | Move the iterator forwards by one
--- display line.
+-- | Move the iterator forwards by one display line.
 --
 -- * Moves the given 'TextIter' forward by one display (wrapped)
 --   line. A display line is different from a paragraph. Paragraphs are
@@ -402,8 +408,7 @@
 textViewBackwardDisplayLine tv ti = liftM toBool $
   {#call unsafe text_view_backward_display_line#} (toTextView tv) ti
  
--- | Move the iterator forwards and to
--- the end.
+-- | Move the iterator forwards and to the end.
 --
 -- * Like 'textViewForwardDisplayLine' but moves to the end of 
 --   the line as well.
@@ -412,8 +417,7 @@
 textViewForwardDisplayLineEnd ti tv = liftM toBool $
   {#call unsafe text_view_forward_display_line_end#} (toTextView tv) ti
 
--- | Move the iterator backwards and to
--- the end.
+-- | Move the iterator backwards and to the end.
 --
 -- * See 'textViewForwardDisplayLineEnd'.
 --
@@ -421,8 +425,7 @@
 textViewBackwardDisplayLineEnd tv ti = liftM toBool $
   {#call unsafe text_view_backward_display_line_start#} (toTextView tv) ti
 
--- | Move the iterator forwards and to
--- the start.
+-- | Move the iterator forwards and to the start.
 --
 -- * Like 'textViewForwardDisplayLine' but moves to the start of
 --   the line as well.
@@ -432,8 +435,7 @@
 textViewForwardDisplayLineStart tv ti = liftM toBool $
   {#call unsafe text_view_forward_display_line_end#} (toTextView tv) ti
 
--- | Move the iterator backwards and
--- to the start.
+-- | Move the iterator backwards and to the start.
 --
 -- * See 'textViewForwardDisplayLineStart'.
 --
@@ -442,11 +444,18 @@
 textViewBackwardDisplayLineStart tv ti = liftM toBool $
   {#call unsafe text_view_backward_display_line_start#} (toTextView tv) ti
 
+-- | Determines whether the iter is at the start of a display line.
+--
+-- * See 'textViewForwardDisplayLine' for an explanation of display lines vs.
+-- paragraphs.
+--
+textViewStartsDisplayLine :: TextViewClass tv => tv -> TextIter -> IO Bool
+textViewStartsDisplayLine tv ti = liftM toBool $
+  {#call unsafe text_view_starts_display_line#} (toTextView tv) ti 
 
 -- | Move the iterator a number of lines.
 --
--- * @count@ is in display lines. See
---   'textViewForwardDisplayLine'.
+-- * The @count@ is in display lines. See 'textViewForwardDisplayLine'.
 --
 textViewMoveVisually :: TextViewClass tv => tv -> TextIter -> Int -> IO Bool
 textViewMoveVisually tv ti count = liftM toBool $
@@ -673,6 +682,17 @@
 textViewGetIndent tv = liftM (fromIntegral) $
   {#call unsafe text_view_get_indent#} (toTextView tv)
 
+-- | Obtains a copy of the default text attributes. These are the attributes
+-- used for text unless a tag overrides them.
+--
+textViewGetDefaultAttributes :: TextViewClass tv => tv -> IO TextAttributes
+textViewGetDefaultAttributes tv =
+  {#call gtk_text_view_get_default_attributes#} (toTextView tv)
+   >>= makeNewTextAttributes
+
+
+-- Signals
+
 -- | Copying to the clipboard.
 --
 -- * This signal is emitted when a selection is copied to the clipboard. 

Index: TextTag.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/multiline/TextTag.chs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- TextTag.chs	23 May 2004 16:09:08 -0000	1.6
+++ TextTag.chs	5 Aug 2004 14:24:28 -0000	1.7
@@ -1,36 +1,47 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
---  GIMP Toolkit (GTK) TextTag TextBuffer
+-- GIMP Toolkit (GTK) Widget TextTag
 --
---  Author : Axel Simon
---          
---  Created: 24 February 2002
+--  Author : Duncan Coutts
+--  Created: 4 August 2004
 --
---  Version $Revision$ from $Date$
+--  Copyright (c) 2004 Duncan Coutts
 --
---  This file is free software; you can redistribute it and/or modify
---  it under the terms of the GNU General Public License as published by
---  the Free Software Foundation; either version 2 of the License, or
---  (at your option) any later version.
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Library General Public
+--  License as published by the Free Software Foundation; either
+--  version 2 of the License, or (at your option) any later version.
 --
---  This file is distributed in the hope that it will be useful,
+--  This library is distributed in the hope that it will be useful,
 --  but WITHOUT ANY WARRANTY; without even the implied warranty of
---  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---  GNU General Public License for more details.
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+--  Library General Public License for more details.
 --
 -- |
 --
+-- A tag that can be applied to text in a "TextBuffer".
+--
+-- TODO
+--
+-- * accessor functions for TextAttributes
 
 module TextTag(
   TextTag,
   TextTagClass,
   castToTextTag,
-  TagName
+  TagName,
+  textTagNew,
+  textTagSetPriority,
+  textTagGetPriority,
+  TextAttributes(..),
+  textAttributesNew,
+  makeNewTextAttributes,  --internal
   ) where
 
 import Monad	(liftM)
 import FFI
 
-import Object	(makeNewObject)
+import GObject	(makeNewGObject)
 {#import Hierarchy#}
 {#import Signal#}
 
@@ -38,5 +49,69 @@
 
 type TagName = String
 
--- methods
+-- TextTag methods
 
+-- | Creates a 'TextTag'.
+--
+textTagNew :: TagName -> IO TextTag
+textTagNew name =
+  withCString name $ \strPtr ->
+  makeNewGObject mkTextTag $ {#call unsafe text_tag_new#} strPtr
+
+-- | Get the tag priority.
+--
+textTagGetPriority :: TextTagClass obj => obj -> IO Int
+textTagGetPriority obj = liftM fromIntegral $
+  {#call unsafe text_tag_get_priority#} (toTextTag obj)
+
+-- | Sets the priority of a 'TextTag'.
+--
+-- Valid priorities are start at 0 and go to one less than
+-- 'textTagTableGetSize'. Each tag in a table has a unique priority; setting the
+-- priority of one tag shifts the priorities of all the other tags in the table
+-- to maintain a unique priority for each tag. Higher priority tags \"win\" if
+-- two tags both set the same text attribute. When adding a tag to a tag table,
+-- it will be assigned the highest priority in the table by default; so normally
+-- the precedence of a set of tags is the order in which they were added to the
+-- table, or created with 'textBufferCreateTag', which adds the tag to the
+-- buffer's table automatically.
+--
+textTagSetPriority :: TextTagClass obj => obj -> Int -> IO ()
+textTagSetPriority obj priority =
+  {#call text_tag_set_priority#} (toTextTag obj) (fromIntegral priority)
+
+
+-- TextAttributes methods
+
+{#pointer * TextAttributes foreign newtype#}
+
+-- | Creates a 'TextAttributes', which describes a set of properties on some
+-- text.
+--
+textAttributesNew :: IO TextAttributes
+textAttributesNew =
+  {#call unsafe text_attributes_new#} >>= makeNewTextAttributes
+
+makeNewTextAttributes :: Ptr TextAttributes -> IO TextAttributes
+makeNewTextAttributes ptr =
+  liftM TextAttributes $ newForeignPtr ptr (text_attributes_unref ptr)
+
+#if __GLASGOW_HASKELL__>=600
+                                                                                
+foreign import ccall unsafe "&gtk_text_attributes_unref"
+  text_attributes_unref' :: FinalizerPtr TextAttributes
+                                                                                
+text_attributes_unref :: Ptr TextAttributes -> FinalizerPtr TextAttributes
+text_attributes_unref _ = text_attributes_unref'
+                                                                                
+#elif __GLASGOW_HASKELL__>=504
+                                                                                
+foreign import ccall unsafe "gtk_text_attributes_unref"
+  text_attributes_unref :: Ptr TextAttributes -> IO ()
+                                                                                
+#else
+                                                                                
+foreign import ccall "gtk_text_attributes_unref" unsafe
+  text_attributes_unref :: Ptr TextAttributes -> IO ()
+                                                                                
+#endif

Index: TextTagTable.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/multiline/TextTagTable.chs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- TextTagTable.chs	23 May 2004 16:09:08 -0000	1.6
+++ TextTagTable.chs	5 Aug 2004 14:24:28 -0000	1.7
@@ -1,42 +1,105 @@
+{-# OPTIONS -cpp #-}
 -- -*-haskell-*-
---  GIMP Toolkit (GTK) TextTagTable TextBuffer
+-- GIMP Toolkit (GTK) Widget TextTagTable
 --
---  Author : Axel Simon
---          
---  Created: 20 March 2002
+--  Author : Duncan Coutts
+--  Created: 4 August 2004
 --
---  Version $Revision$ from $Date$
+--  Copyright (c) 2004 Duncan Coutts
 --
---  This file is free software; you can redistribute it and/or modify
---  it under the terms of the GNU General Public License as published by
---  the Free Software Foundation; either version 2 of the License, or
---  (at your option) any later version.
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Library General Public
+--  License as published by the Free Software Foundation; either
+--  version 2 of the License, or (at your option) any later version.
 --
---  This file is distributed in the hope that it will be useful,
+--  This library is distributed in the hope that it will be useful,
 --  but WITHOUT ANY WARRANTY; without even the implied warranty of
---  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---  GNU General Public License for more details.
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+--  Library General Public License for more details.
 --
 -- |
 --
--- TODO
---
--- * Everything.
---
-module TextTagTable(
+
+module TextTagTable (
   TextTagTable,
   TextTagTableClass,
   castToTextTagTable,
+  textTagTableNew,
+  textTagTableAdd,
+  textTagTableRemove,
+  textTagTableLookup,
+  textTagTableForeach,
+  textTagTableGetSize
   ) where
 
 import Monad	(liftM)
 import FFI
 
-import Object	(makeNewObject)
+import GObject	(makeNewGObject)
 {#import Hierarchy#}
 {#import Signal#}
 
 {# context lib="gtk" prefix="gtk" #}
 
--- methods
+-- | Creates a new 'TextTagTable'. The table contains no tags by default.
+--
+textTagTableNew :: IO TextTagTable
+textTagTableNew =
+  makeNewGObject mkTextTagTable $ 
+  {#call unsafe text_tag_table_new#}
 
+-- | Add a tag to the table. The tag is assigned the highest priority in the
+-- table.
+--
+-- The tag must not be in a tag table already, and may not have the same name as
+-- an already-added tag.
+--
+textTagTableAdd :: TextTagTableClass obj => obj -> TextTag -> IO ()
+textTagTableAdd obj tag =
+  {#call text_tag_table_add#} (toTextTagTable obj) tag
+
+-- | Remove a tag from the table.
+--
+textTagTableRemove :: TextTagTableClass obj => obj -> TextTag -> IO ()
+textTagTableRemove obj tag =
+  {#call text_tag_table_remove#} (toTextTagTable obj) tag
+
+-- | Look up a named tag.
+--
+textTagTableLookup :: TextTagTableClass obj => obj
+                   -> String -> IO (Maybe TextTag)
+textTagTableLookup obj name =
+  withCString name $ \strPtr -> do
+  tagPtr <- {#call unsafe text_tag_table_lookup#} (toTextTagTable obj) strPtr
+  if tagPtr == nullPtr then return Nothing else liftM Just $
+    makeNewGObject mkTextTag (return tagPtr)
+
+-- | Calls func on each tag in table.
+--
+textTagTableForeach :: TextTagTableClass obj => obj
+                    -> (TextTag -> IO ()) -> IO ()
+textTagTableForeach obj func = do
+  funcPtr <- mkTextTagTableForeach (\tagPtr _ -> do
+    tag <- makeNewGObject mkTextTag (return tagPtr)
+    func tag)
+  {#call text_tag_table_foreach#} (toTextTagTable obj) funcPtr nullPtr
+
+{#pointer TextTagTableForeach#}
+
+#if __GLASGOW_HASKELL__>=600
+
+foreign import ccall "wrapper" mkTextTagTableForeach ::
+  (Ptr TextTag -> Ptr () -> IO ()) -> IO TextTagTableForeach
+
+#else
+
+foreign export dynamic mkTextTagTableForeach ::
+  (Ptr Widget -> Ptr () -> IO ()) -> IO TextTagTableForeach
+
+#endif
+
+-- | Returns the size of the table (the number of tags).
+--
+textTagTableGetSize :: TextTagTableClass obj => obj -> IO Int
+textTagTableGetSize obj = liftM fromIntegral $
+  {#call unsafe text_tag_table_get_size#} (toTextTagTable obj)

[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

[Gtk2hs-commit] gtk2hs ChangeLog,1.212,1.213

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

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

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


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- ChangeLog	4 Aug 2004 19:11:18 -0000	1.212
+++ ChangeLog	5 Aug 2004 14:24:27 -0000	1.213
@@ -1,5 +1,13 @@
 2004-08-4  Duncan Coutts <du...@co...>
 
+	* gtk/treeList/TreeView.chs, gtk/multiline/TextTag.chs,
+	gtk/multiline/TextTagTable.chs, gtk/multiline/TextView.chs: add missing
+	functions & fix typo bug.
+
+	* gtk/treeList/api.ignore: add more ignored functions.
+
+2004-08-4  Duncan Coutts <du...@co...>
+
 	* gtk/abstract/Container.chs, gtk/treeList/TreeSelection.chs,
 	gtk/treeList/TreeModelSort.chs, gtk/treeList/TreeViewColumn.chs,
 	gtk/treeList/TreeModel.chs: add missing functions.

[Gtk2hs-commit] gtk2hs/gtk/entry Entry.chs,1.10,1.11

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

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

Modified Files:
	Entry.chs 
Log Message:
Minor doc fixes.


Index: Entry.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/entry/Entry.chs,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Entry.chs	30 Jul 2004 16:32:01 -0000	1.10
+++ Entry.chs	4 Aug 2004 19:11:21 -0000	1.11
@@ -212,9 +212,9 @@
   liftM realToFrac $ {#call unsafe entry_get_alignment#} (toEntry ec)
 
 #if GTK_CHECK_VERSION(2,4,0)
--- | Sets the auxiliary completion object to use with
--- the entry. All further configuration of the completion mechanism is done on
--- completion using the GtkEntryCompletion API.
+-- | Sets the auxiliary completion object to use with the entry. All further
+-- configuration of the completion mechanism is done on completion using the
+-- "EntryCompletion" API.
 --
 -- * Since gtk 2.4
 --
@@ -222,8 +222,7 @@
 entrySetCompletion ec completion = {#call gtk_entry_set_completion#}
   (toEntry ec) completion
 
--- | Returns the auxiliary completion object currently
--- in use by entry
+-- | Returns the auxiliary completion object currently in use by the entry.
 --
 -- * Since gtk 2.4
 --

[Gtk2hs-commit] gtk2hs/gtk/abstract Object.chs,1.9,1.10

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

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

Modified Files:
	Object.chs 
Log Message:
Minor doc fixes.


Index: Object.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/abstract/Object.chs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Object.chs	23 May 2004 15:46:02 -0000	1.9
+++ Object.chs	4 Aug 2004 19:11:20 -0000	1.10
@@ -91,7 +91,7 @@
   return $ constr obj
 
 
--- method private objectSetProperty Sets a specific attribute of this object.
+-- Sets a specific attribute of this object.
 --
 -- * Most attributes in a widget can be set and retrieved by passing the
 --   name (as a string) and the value to special set\/get functions. These
@@ -105,9 +105,9 @@
   (toGObject obj) sPtr vaPtr >> valueUnset vaPtr
   
 
--- method private objectGetProperty Gets a specific attribute of this object.
+-- Gets a specific attribute of this object.
 --
--- * See objectSetProperty.
+-- * See 'objectSetProperty'.
 --
 objectGetProperty :: GObjectClass gobj => gobj -> String -> 
 					IO GenericValue

[Gtk2hs-commit] gtk2hs ChangeLog,1.211,1.212

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

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

Modified Files:
	ChangeLog 
Log Message:
Minor doc fixes.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- ChangeLog	4 Aug 2004 18:46:32 -0000	1.211
+++ ChangeLog	4 Aug 2004 19:11:18 -0000	1.212
@@ -11,6 +11,8 @@
 	gtk/Makefile: add --disable-deprecated config option. Note that this
 	configuration will not build sucessfully yet.
 
+	* gtk/abstract/Object.chs, gtk/entry/Entry.chs: minor doc fixes.
+
 2004-08-3  Duncan Coutts <du...@co...>
 
 	* gtk/abstract/FileChooser.chs, gtk/general/FFI.hs: move a couple of

[Gtk2hs-commit] gtk2hs ChangeLog,1.210,1.211 configure.in,1.37,1.38

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

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

Modified Files:
	ChangeLog configure.in 
Log Message:
Add --disable-deprecated config option.
Note that this configuration will not build sucessfully yet; other modules
need to be modified to conditionally compile deprecated functions.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -d -r1.210 -r1.211
--- ChangeLog	4 Aug 2004 18:41:43 -0000	1.210
+++ ChangeLog	4 Aug 2004 18:46:32 -0000	1.211
@@ -7,6 +7,10 @@
 	* gtk/abstract/api.ignore, gtk/treeList/api.ignore: update list of
 	ignored functions.
 
+	* configure.in, mk/config.mk.in, tools/hierarchyGen/hierarchy.list,
+	gtk/Makefile: add --disable-deprecated config option. Note that this
+	configuration will not build sucessfully yet.
+
 2004-08-3  Duncan Coutts <du...@co...>
 
 	* gtk/abstract/FileChooser.chs, gtk/general/FFI.hs: move a couple of

Index: configure.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- configure.in	26 Jul 2004 12:14:46 -0000	1.37
+++ configure.in	4 Aug 2004 18:46:32 -0000	1.38
@@ -351,6 +351,15 @@
   esac;
 done;
 
+dnl Check if user wants bindings for deprecated APIs. Defaults to yes.
+AC_MSG_CHECKING([whether to build deprecated bindings])
+
+AC_ARG_ENABLE(deprecated,
+	     [  --disable-deprecated    do not generate bindings for any deprecated APIs],
+	     [ENABLE_DEPRECATED=$enableval],[ENABLE_DEPRECATED=yes])
+
+DISABLE_DEPRECATED=`test $ENABLE_DEPRECATED = yes && echo no || echo yes`
+AC_MSG_RESULT($ENABLE_DEPRECATED)
 
 dnl Have a special marshall list (available in the source tree of Gtk+ under
 dnl gtk/gtkmarshal.list)
@@ -556,6 +565,7 @@
 dnl AC_SUBST(GTK_MICRO_VERSION)
 AC_SUBST(GTK_VERSION_2_2)
 AC_SUBST(GTK_VERSION_2_4)
+AC_SUBST(DISABLE_DEPRECATED)
 dnl Optional packages
 AC_SUBST(ENABLE_OPENGL)
 AC_SUBST(ENABLE_LIBGLADE)

[Gtk2hs-commit] gtk2hs/mk config.mk.in,1.26,1.27

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

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16391/mk

Modified Files:
	config.mk.in 
Log Message:
Add --disable-deprecated config option.
Note that this configuration will not build sucessfully yet; other modules
need to be modified to conditionally compile deprecated functions.


Index: config.mk.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/config.mk.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- config.mk.in	27 Jul 2004 08:22:16 -0000	1.26
+++ config.mk.in	4 Aug 2004 18:46:32 -0000	1.27
@@ -92,6 +92,9 @@
 # Provide gnome bindings.
 ENABLE_GNOME = @ENABLE_GNOME@
 
+# Do not provide depricated bindings
+DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+
 # This should be libXXX.a and XXX for Unix and
 #		    XXX.lib and XXX.exe for Windows
 

[Gtk2hs-commit] gtk2hs/tools/hierarchyGen hierarchy.list,1.9,1.10

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

Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16391/tools/hierarchyGen

Modified Files:
	hierarchy.list 
Log Message:
Add --disable-deprecated config option.
Note that this configuration will not build sucessfully yet; other modules
need to be modified to conditionally compile deprecated functions.


Index: hierarchy.list
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/hierarchy.list,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hierarchy.list	3 Aug 2004 03:51:42 -0000	1.9
+++ hierarchy.list	4 Aug 2004 18:46:33 -0000	1.10
@@ -43,7 +43,7 @@
                 GtkMisc
                     GtkLabel
                         GtkAccelLabel
-                        GtkTipsQuery
+                        GtkTipsQuery	if deprecated
                     GtkArrow
                     GtkImage
                 GtkContainer
@@ -55,14 +55,14 @@
                             GtkToggleButton
                                 GtkCheckButton
                                     GtkRadioButton
-                            GtkOptionMenu
+                            GtkOptionMenu		if deprecated
                         GtkItem
                             GtkMenuItem
                                 GtkCheckMenuItem
                                     GtkRadioMenuItem
                                 GtkTearoffMenuItem
                                 GtkImageMenuItem
-                            GtkListItem
+                            GtkListItem			if deprecated
 #			    GtkTreeItem
                         GtkWindow
                             GtkDialog
@@ -95,16 +95,16 @@
                             GtkGammaCurve
 			    GtkFileChooserWidget	if gtk-2.4
                         GtkHBox
-                            GtkCombo
+                            GtkCombo	if deprecated
                             GtkStatusbar
-                    GtkCList
-                        GtkCTree
+                    GtkCList		if deprecated
+                        GtkCTree	if deprecated
                     GtkFixed
                     GtkPaned
                         GtkHPaned
                         GtkVPaned
                     GtkLayout
-                    GtkList
+                    GtkList		if deprecated
                     GtkMenuShell
                         GtkMenu
                         GtkMenuBar
@@ -137,14 +137,14 @@
                 GtkInvisible
 #                GtkOldEditable
 #                    GtkText
-                GtkPreview
+                GtkPreview		if deprecated
 # Progress is deprecated, ProgressBar contains everything necessary
 #                GtkProgress
                 GtkProgressBar
             GtkAdjustment
             GtkIMContext
                 GtkIMMulticontext
-            GtkItemFactory
+            GtkItemFactory		if deprecated
             GtkTooltips
 
 # These object were added by hand because they do not show up in the hierarchy

[Gtk2hs-commit] gtk2hs/gtk Makefile,1.30,1.31

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

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

Modified Files:
	Makefile 
Log Message:
Add --disable-deprecated config option.
Note that this configuration will not build sucessfully yet; other modules
need to be modified to conditionally compile deprecated functions.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile	3 Aug 2004 04:16:56 -0000	1.30
+++ Makefile	4 Aug 2004 18:46:34 -0000	1.31
@@ -213,6 +213,15 @@
 endif
 ifeq ($(GTK_VERSION_2_4),yes)
 CREATE_TYPES += gtk-2.4
+endif
+ifeq ($(DISABLE_DEPRECATED),no)
+CREATE_TYPES += deprecated
+endif
+
+ifeq ($(DISABLE_DEPRECATED),yes)
+C2HSFLAGS += -C-DG_DISABLE_DEPRECATED -C-DGDK_PIXBUF_DISABLE_DEPRECATED\
+ -C-DGDK_DISABLE_DEPRECATED -C-DGTK_DISABLE_DEPRECATED
+endif
 
 general/Hierarchy.chs : $(TOP)/tools/hierarchyGen/hierarchy.list
 	$(strip $(TOP)/tools/hierarchyGen/TypeGenerator \

[Gtk2hs-commit] gtk2hs ChangeLog,1.209,1.210

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

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

Modified Files:
	ChangeLog 
Log Message:
Add missing functions and list more ignored functions.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- ChangeLog	3 Aug 2004 16:56:49 -0000	1.209
+++ ChangeLog	4 Aug 2004 18:41:43 -0000	1.210
@@ -1,3 +1,12 @@
+2004-08-4  Duncan Coutts <du...@co...>
+
+	* gtk/abstract/Container.chs, gtk/treeList/TreeSelection.chs,
+	gtk/treeList/TreeModelSort.chs, gtk/treeList/TreeViewColumn.chs,
+	gtk/treeList/TreeModel.chs: add missing functions.
+
+	* gtk/abstract/api.ignore, gtk/treeList/api.ignore: update list of
+	ignored functions.
+
 2004-08-3  Duncan Coutts <du...@co...>
 
 	* gtk/abstract/FileChooser.chs, gtk/general/FFI.hs: move a couple of

[Gtk2hs-commit] gtk2hs/gtk/treeList TreeSelection.chs,1.9,1.10 TreeModelSort.chs,1.3,1.4 TreeViewColumn.chs,1.8,1.9 TreeModel.chs,1.12,1.13 api.ignore,1.2,1.3

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

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

Modified Files:
	TreeSelection.chs TreeModelSort.chs TreeViewColumn.chs 
	TreeModel.chs api.ignore 
Log Message:
Add missing functions and list more ignored functions.


Index: TreeModelSort.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeModelSort.chs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TreeModelSort.chs	23 May 2004 16:16:43 -0000	1.3
+++ TreeModelSort.chs	4 Aug 2004 18:42:00 -0000	1.4
@@ -1,41 +1,128 @@
 -- -*-haskell-*-
---  GIMP Toolkit (GTK) TreeModelSort
---
---  Author : Axel Simon
---          
---  Created: 9 July 2002
+-- GIMP Toolkit (GTK) TreeModelSort
 --
---  Version $Revision$ from $Date$
+--  Author : Duncan Coutts
+--  Created: 4 August 2004
 --
---  Copyright (c) 1999..2002 Axel Simon
+--  Copyright (c) 2004 Duncan Coutts
 --
---  This file is free software; you can redistribute it and/or modify
---  it under the terms of the GNU General Public License as published by
---  the Free Software Foundation; either version 2 of the License, or
---  (at your option) any later version.
+--  This library is free software; you can redistribute it and/or
+--  modify it under the terms of the GNU Library General Public
+--  License as published by the Free Software Foundation; either
+--  version 2 of the License, or (at your option) any later version.
 --
---  This file is distributed in the hope that it will be useful,
+--  This library is distributed in the hope that it will be useful,
 --  but WITHOUT ANY WARRANTY; without even the implied warranty of
---  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---  GNU General Public License for more details.
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+--  Library General Public License for more details.
 --
 -- |
+-- 
+-- The 'TreeModelSort' is a model that turns any object that implements the
+-- 'TreeModel' interface into a store that is sorted.
 --
--- 'TreeModelSort' is an aggregated class to 'TreeModel'.
--- It turns any object derived from 'TreeModel' into a store that
--- is sorted.
+-- It does not hold any data itself, but rather is created with a child model
+-- and proxies its data. It has identical column types to this child model, and
+-- the changes in the child are propagated. The primary purpose of this model is
+-- to provide a way to sort a different model without modifying it.
 --
-module TreeModelSort(
-  TreeModelSort,
-  TreeModelSortClass
 
+module TreeModelSort (
+  TreeModelSort,
+  TreeModelSortClass,
+  treeModelSortNewWithModel,
+  treeModelSortGetModel,
+  treeModelSortConvertChildPathToPath,
+  treeModelSortConvertPathToChildPath,
+  treeModelSortConvertChildIterToIter,
+  treeModelSortConvertIterToChildIter,  
+  treeModelSortResetDefaultSortFunc
   ) where
 
 import Monad	(liftM, when)
 import FFI
 
+import GObject	(makeNewGObject)
 {#import Hierarchy#}
-import Signal	    
+{#import TreeModel#}
+import Structs	(treeIterSize)
 
 {# context lib="gtk" prefix="gtk" #}
 
+
+-- | Creates a new 'TreeModelSort', that will be a sorted view of the given
+-- model.
+--
+treeModelSortNewWithModel :: TreeModelClass tm => tm -> IO TreeModelSort
+treeModelSortNewWithModel model =
+  makeNewGObject mkTreeModelSort $ liftM castPtr $
+  {#call unsafe tree_model_sort_new_with_model#} (toTreeModel model)
+
+-- | Returns the underlying model the 'TreeModelSort' is sorting.
+--
+treeModelSortGetModel :: TreeModelSortClass obj => obj -> IO TreeModel
+treeModelSortGetModel obj =
+  makeNewGObject mkTreeModel $
+  {#call tree_model_sort_get_model#} (toTreeModelSort obj)
+
+-- | Converts the given path to a path relative to the given sorted model. That
+-- is, the given path points to a row in the child model. The returned path will
+-- point to the same row in the sorted model.
+--
+treeModelSortConvertChildPathToPath :: TreeModelSortClass obj => obj
+                                    -> TreePath -> IO TreePath
+treeModelSortConvertChildPathToPath obj childPath = do
+  pathPtr <-
+    throwIfNull "treeModelSortConvertChildPathToPath: invalid path given" $ 
+    {#call unsafe tree_model_sort_convert_child_path_to_path#}
+    (toTreeModelSort obj) childPath
+  liftM TreePath $ newForeignPtr pathPtr (tree_path_free pathPtr)
+
+-- | Converts path in the sorted model to a path on the unsorted model on which
+-- the given 'TreeModelSort' is based. That is, the given path points to a
+-- location in the given 'TreeModelSort'. The returned path will point to the
+-- same location in the underlying unsorted model.
+--
+treeModelSortConvertPathToChildPath :: TreeModelSortClass obj => obj
+                                    -> TreePath -> IO TreePath
+treeModelSortConvertPathToChildPath obj sortedPath = do
+  pathPtr <-
+    throwIfNull "treeModelSortConvertPathToChildPath: invalid path given" $ 
+    {#call unsafe tree_model_sort_convert_path_to_child_path#}
+    (toTreeModelSort obj) sortedPath
+  liftM TreePath $ newForeignPtr pathPtr (tree_path_free pathPtr)
+
+-- | Return an iterator in the sorted model that points to the row pointed to
+-- by the given iter from the unsorted model.
+--
+treeModelSortConvertChildIterToIter :: TreeModelSortClass obj => obj
+                                    -> TreeIter -> IO TreeIter
+treeModelSortConvertChildIterToIter obj childIter = do
+  sortIterPtr <- mallocBytes treeIterSize
+  sortIter <- liftM TreeIter $ newForeignPtr sortIterPtr
+                (foreignFree sortIterPtr)
+  {#call tree_model_sort_convert_child_iter_to_iter#} (toTreeModelSort obj)
+    sortIter childIter
+  return sortIter
+
+-- | Return an iterator in the unsorted model that points to the row pointed to
+-- by the given iter from the sorted model.
+--
+treeModelSortConvertIterToChildIter :: TreeModelSortClass obj => obj
+                                    -> TreeIter -> IO TreeIter
+treeModelSortConvertIterToChildIter obj sortedIter = do
+  childIterPtr <- mallocBytes treeIterSize
+  childIter <- liftM TreeIter $ newForeignPtr childIterPtr
+                 (foreignFree childIterPtr)
+  {#call unsafe tree_model_sort_convert_iter_to_child_iter#}
+    (toTreeModelSort obj) childIter sortedIter
+  return childIter
+
+-- | This resets the default sort function to be in the \'unsorted\' state. That
+-- is, it is in the same order as the child model. It will re-sort the model to
+-- be in the same order as the child model only if the 'TreeModelSort' is in 
+-- \'unsorted\' state.
+--
+treeModelSortResetDefaultSortFunc :: TreeModelSortClass obj => obj -> IO ()
+treeModelSortResetDefaultSortFunc obj =
+  {#call tree_model_sort_reset_default_sort_func#} (toTreeModelSort obj)

Index: TreeModel.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeModel.chs,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- TreeModel.chs	23 May 2004 16:16:43 -0000	1.12
+++ TreeModel.chs	4 Aug 2004 18:42:00 -0000	1.13
@@ -35,12 +35,15 @@
   treeModelGetNColumns,
   treeModelGetColumnType,
   treeModelGetValue,
+  TreeModelFlags(..),
+  treeModelGetFlags,
   TreePath(..),
   createTreePath,			-- internal
   tree_path_copy,			-- internal
   tree_path_free,			-- internal
   treePathNew,
   treePathNewFromString,
+  treePathNewFromIndicies,
   treePathToString,
   treePathNewFirst,
   treePathAppendIndex,
@@ -53,6 +56,12 @@
   treePathPrev,
   treePathUp,
   treePathDown,
+  treePathIsAncestor,
+  treePathIsDescendant,
+  TreeRowReference(..),
+  treeRowReferenceNew,
+  treeRowReferenceGetPath,
+  treeRowReferenceValid,
   TreeIter(..),
   createTreeIter,			-- internal
   treeModelGetIter,
@@ -72,29 +81,43 @@
 
 import Monad	(liftM, when)
 import Maybe	(fromMaybe)
+import List   (intersperse)
 import FFI
 {#import Hierarchy#}
 {#import Signal#}
 import Structs	                (treeIterSize)
+import GdkEnums     (Flags(..))
 import StoreValue		(TMType)
 {#import GValue#}		(GValue, GenericValue, valueUnset)
 
 {# context lib="gtk" prefix="gtk" #}
 
--- | Tree Iterator : A pointer to an entry in a
--- 'TreeStore' or 'ListStore'.
+-- | Tree Iterator : A pointer to an entry in a 'TreeStore' or 'ListStore'.
 --
 {#pointer * TreeIter foreign newtype#}
 
--- | TreePath : a list of indices to specify a subtree or node
--- in the hierarchical 'TreeStore' database.
+-- | TreePath : a list of indices to specify a subtree or node in the
+-- hierarchical 'TreeStore' database.
 --
 {#pointer * TreePath foreign newtype#}
 
+-- | Tree Row Reference : like a 'TreePath' it points to a subtree or node, but
+-- it is persistent. It identifies the same node (so long as it exists) even
+-- when items are added, removed, or reordered.
+--
+{#pointer * TreeRowReference foreign newtype#}
+
+-- | These flags indicate various properties of a 'TreeModel'. These are
+-- probably not terribly interesting for app developers. See the C documentation
+-- for details.
+--
+{#enum TreeModelFlags {underscoreToCase} deriving(Bounded)#}
+
+instance Flags TreeModelFlags
+
 -- methods
 
--- | Read the number of columns this
--- 'TreeModel' currently stores.
+-- | Read the number of columns this 'TreeModel' currently stores.
 --
 treeModelGetNColumns :: TreeModelClass tm => tm -> IO Int
 treeModelGetNColumns tm = liftM fromIntegral $ 
@@ -107,8 +130,7 @@
   {#call unsafe tree_model_get_column_type#} (toTreeModel tm) 
   (fromIntegral col)
 
--- | Read the value of at a specific column and
--- 'Iterator'.
+-- | Read the value of at a specific column and 'Iterator'.
 --
 treeModelGetValue :: TreeModelClass tm => tm -> TreeIter -> Int ->
                      IO GenericValue
@@ -121,6 +143,45 @@
   valueUnset vaPtr
   return val
 
+-- | Maps a function over each node in model in a depth-first fashion. If the
+-- function returns True, the tree walk stops.
+--
+treeModelForeach :: TreeModelClass tm => tm -> (TreeIter -> IO Bool) -> IO ()
+treeModelForeach tm fun = do
+  fPtr <- mkTreeModelForeachFunc (\_ _ ti _ -> do
+    -- make a deep copy of the iterator. This makes it possible to store this
+    -- iterator in Haskell land somewhere. The TreeModel parameter is not
+    -- passed to the function due to performance reasons. But since it is
+    -- a constant this does not matter.
+    iterPtr <- mallocBytes treeIterSize
+    copyBytes iterPtr ti treeIterSize
+    iter <- liftM TreeIter $ newForeignPtr iterPtr (foreignFree iterPtr)
+    liftM (fromIntegral.fromBool) $ fun iter
+    )
+  {#call tree_model_foreach#} (toTreeModel tm) fPtr nullPtr
+  freeHaskellFunPtr fPtr
+
+{#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 TreePath -> 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.
+--
+treeModelGetFlags :: TreeModelClass tm => tm -> IO [TreeModelFlags]
+treeModelGetFlags tm = liftM (toFlags.fromIntegral) $
+  {#call unsafe tree_model_get_flags#} (toTreeModel tm)
+
 -- utilities related to tree models
 
 -- Create a TreePath from a pointer.
@@ -153,16 +214,19 @@
 
 -- | Create a new 'TreePath'.
 --
--- * A 'TreePath' is an hierarchical index. It is independent of
---   a specific 'TreeModel'.
+-- * A 'TreePath' is an hierarchical index. It is independent of a specific
+-- 'TreeModel'.
 -- 
 treePathNew :: IO TreePath
 treePathNew = do
   tpPtr <- {#call unsafe tree_path_new#} 
   liftM TreePath $ newForeignPtr tpPtr (tree_path_free tpPtr)
 
--- | Turn a @String@ into a
--- 'TreePath'.
+-- | Turn a @String@ into a 'TreePath'.
+--
+-- * For example, the string \"10:4:0\" would create a path of depth 3 pointing
+-- to the 11th child of the root node, the 5th child of that 11th child, and the
+-- 1st child of that 5th child.
 --
 treePathNewFromString :: String -> IO TreePath
 treePathNewFromString path = do
@@ -170,8 +234,14 @@
     withUTFString path {#call unsafe tree_path_new_from_string#}
   liftM TreePath $ newForeignPtr tpPtr (tree_path_free tpPtr)
 
--- | Turn a 'TreePath' into a 
--- @String@.
+-- | Turn a list of indicies into a 'TreePath'. See 'treePathNewFromString' for
+-- the meaning of these indicies.
+--
+treePathNewFromIndicies :: [Int] ->  IO TreePath
+treePathNewFromIndicies =
+  treePathNewFromString . concat . intersperse ":" . map show
+
+-- | Turn a 'TreePath' into a @String@.
 --
 treePathToString :: TreePath -> IO String
 treePathToString tp = do
@@ -249,6 +319,48 @@
 treePathDown :: TreePath -> IO ()
 treePathDown = {#call unsafe tree_path_down#}
 
+-- | Returns True if the second path is a descendant of the first.
+--
+treePathIsAncestor :: TreePath -- ^ A 'TreePath'
+                   -> TreePath -- ^ A possible descendant
+                   -> IO Bool
+treePathIsAncestor path descendant = liftM toBool $
+  {#call unsafe tree_path_is_ancestor#} path descendant
+
+-- | Returns True if the first path is a descendant of the second.
+--
+treePathIsDescendant :: TreePath -- ^ A possible descendant
+                     -> TreePath -- ^ A 'TreePath' 
+                     -> IO Bool
+treePathIsDescendant path ancestor = liftM toBool $
+  {#call unsafe tree_path_is_descendant#} path ancestor
+
+-- | Creates a row reference based on a path. This reference will keep pointing
+-- to the node pointed to by the given path, so long as it exists.
+--
+treeRowReferenceNew :: TreeModelClass tm => tm -> TreePath -> IO TreeRowReference
+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
+
+foreign import ccall unsafe "&tree_row_reference_free"
+  tree_row_reference_free :: FinalizerPtr TreeRowReference
+
+-- | Returns a path that the row reference currently points to, or @Nothing@ if
+-- the path pointed to is no longer valid.
+--
+treeRowReferenceGetPath :: TreeRowReference -> IO (Maybe TreePath)
+treeRowReferenceGetPath ref = do
+  pathPtr <- {#call unsafe tree_row_reference_get_path#} ref
+  if pathPtr == nullPtr then return Nothing else
+    liftM (Just . TreePath) $ newForeignPtr pathPtr (tree_path_free pathPtr)
+
+-- | Returns True if the reference refers to a current valid path.
+--
+treeRowReferenceValid :: TreeRowReference -> IO Bool
+treeRowReferenceValid ref = liftM toBool $
+  {#call unsafe tree_row_reference_valid#} ref
 
 createTreeIter :: Ptr TreeIter -> IO TreeIter
 createTreeIter tiPtr = do

Index: TreeViewColumn.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeViewColumn.chs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- TreeViewColumn.chs	23 May 2004 16:16:43 -0000	1.8
+++ TreeViewColumn.chs	4 Aug 2004 18:42:00 -0000	1.9
@@ -61,6 +61,7 @@
   treeViewColumnGetSizing,
   treeViewColumnGetWidth,
   treeViewColumnSetFixedWidth,
+  treeViewColumnGetFixedWidth,
   treeViewColumnSetMinWidth,
   treeViewColumnGetMinWidth,
   treeViewColumnSetMaxWidth,
@@ -69,6 +70,7 @@
   treeViewColumnSetTitle,
   treeViewColumnGetTitle,
   treeViewColumnSetClickable,
+  treeViewColumnGetClickable,
   treeViewColumnSetWidget,
   treeViewColumnGetWidget,
   treeViewColumnSetAlignment,
@@ -285,15 +287,26 @@
 
 -- | Set the width of the column.
 --
--- * This is meaningful only if the sizing type is
---   'TreeViewColumnFixed'.
+-- * This is meaningful only if the sizing type is 'TreeViewColumnFixed'.
 --
-treeViewColumnSetFixedWidth :: TreeViewColumnClass tvc => Int -> tvc -> IO ()
-treeViewColumnSetFixedWidth width tvc = 
+treeViewColumnSetFixedWidth :: TreeViewColumnClass tvc => tvc -> Int -> IO ()
+treeViewColumnSetFixedWidth tvc width = 
   {#call tree_view_column_set_fixed_width#} 
   (toTreeViewColumn tvc) (fromIntegral width)
 
 
+-- | Gets the fixed width of the column.
+--
+-- * This is meaningful only if the sizing type is 'TreeViewColumnFixed'.
+--
+-- * This value is only meaning may not be the actual width of the column on the
+-- screen, just what is requested.
+--
+treeViewColumnGetFixedWidth :: TreeViewColumnClass tvc => tvc -> IO Int
+treeViewColumnGetFixedWidth tvc = liftM fromIntegral $
+  {#call unsafe tree_view_column_get_fixed_width#} (toTreeViewColumn tvc)
+
+
 -- | Set minimum width of the column.
 --
 treeViewColumnSetMinWidth :: TreeViewColumnClass tvc => tvc -> Int -> IO ()
@@ -341,13 +354,18 @@
   strPtr <- {#call unsafe tree_view_column_get_title#} (toTreeViewColumn tvc)
   if strPtr==nullPtr then return Nothing else liftM Just $ peekUTFString strPtr
 
--- | Set if the column should be sensitive
--- to mouse clicks.
+-- | Set if the column should be sensitive to mouse clicks.
 --
 treeViewColumnSetClickable :: TreeViewColumnClass tvc => tvc -> Bool -> IO ()
 treeViewColumnSetClickable tvc click = {#call tree_view_column_set_clickable#} 
   (toTreeViewColumn tvc) (fromBool click)
 
+-- | Returns True if the user can click on the header for the column.
+--
+treeViewColumnGetClickable :: TreeViewColumnClass tvc => tvc -> IO Bool
+treeViewColumnGetClickable tvc = liftM toBool $
+  {#call tree_view_column_get_clickable#} (toTreeViewColumn tvc)
+
 -- | Set the column's title to this widget.
 --
 treeViewColumnSetWidget :: (TreeViewColumnClass tvc, WidgetClass w) => tvc ->

Index: api.ignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/api.ignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- api.ignore	1 Aug 2004 16:08:14 -0000	1.2
+++ api.ignore	4 Aug 2004 18:42:00 -0000	1.3
@@ -22,9 +22,55 @@
 
 #vararg constructor func, we use newv instead
 always exclude gtk_list_store_new$
+always exclude gtk_tree_store_new$
 
 #vararg set function
-always exclude gtk_list_store_set
+always exclude gtk_list_store_set$
+always exclude gtk_tree_store_set$
+
+#more vararg stuff
+always exclude gtk_tree_path_new_from_indices
+
+#only for subclasses
+always exclude gtk_list_store_set_column_types
+always exclude gtk_tree_store_set_column_types
 
 #debugging function
 always exclude gtk_list_store_iter_is_valid
+
+#internal reference stuff
+always exclude gtk_tree_row_reference_deleted
+always exclude gtk_tree_row_reference_inserted
+always exclude gtk_tree_row_reference_new_proxy
+always exclude gtk_tree_row_reference_reordered
+always exclude gtk_tree_row_reference_copy
+
+#not useful for us
+always exclude gtk_tree_selection_get_user_data
+
+#TreeModel vararg stuff
+always exclude gtk_tree_model_get$
+
+#only for TreeModel implementations
+always exclude gtk_tree_model_row_deleted
+always exclude gtk_tree_model_rows_reordered
+always exclude gtk_tree_model_row_has_child_toggled
+always exclude gtk_tree_model_row_inserted
+always exclude gtk_tree_model_row_changed
+
+#very low level control
+always exclude gtk_tree_model_sort_clear_cache
+
+#for debugging only
+always exclude gtk_tree_model_sort_iter_is_valid
+
+#TreeViewColumn stuff
+#vararg attributes stuff
+always exclude gtk_tree_view_column_new_with_attributes
+always exclude gtk_tree_view_column_set_attributes
+
+#internal, only used by TreeView
+always exclude gtk_tree_view_column_cell_get_size
+always exclude gtk_tree_view_column_cell_set_cell_data
+always exclude gtk_tree_view_column_cell_is_visible
+

Index: TreeSelection.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/treeList/TreeSelection.chs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- TreeSelection.chs	23 May 2004 16:16:43 -0000	1.9
+++ TreeSelection.chs	4 Aug 2004 18:42:00 -0000	1.10
@@ -38,6 +38,7 @@
   castToTreeSelection,
   SelectionMode(..),
   treeSelectionSetMode,
+  treeSelectionGetMode,
   TreeSelectionCB,
   treeSelectionSetSelectFunction,
   treeSelectionGetTreeView,
@@ -46,8 +47,10 @@
   treeSelectionSelectedForeach,
   treeSelectionSelectPath,
   treeSelectionUnselectPath,
+  treeSelectionPathIsSelected,
   treeSelectionSelectIter,
   treeSelectionUnselectIter,
+  treeSelectionIterIsSelected,
   treeSelectionSelectAll,
   treeSelectionUnselectAll,
   treeSelectionSelectRange,
@@ -77,6 +80,12 @@
 treeSelectionSetMode ts sm = {#call tree_selection_set_mode#}
   (toTreeSelection ts) ((fromIntegral.fromEnum) sm)
 
+-- | Gets the selection mode.
+--
+treeSelectionGetMode :: (TreeSelectionClass ts) => ts -> IO SelectionMode
+treeSelectionGetMode ts = liftM (toEnum.fromIntegral) $
+  {#call unsafe tree_selection_get_mode#} (toTreeSelection ts)
+
 -- | Set a callback function if
 -- selection changes.
 --
@@ -154,8 +163,7 @@
   {#call tree_selection_selected_foreach#} (toTreeSelection ts) fPtr nullPtr
   freeHaskellFunPtr fPtr
 
--- | Callback function type for
--- 'treeSelectionSelectedForeach'.
+-- | Callback function type for 'treeSelectionSelectedForeach'.
 --
 type TreeSelectionForeachCB = TreeIter -> IO ()
 {#pointer TreeSelectionForeachFunc#}
@@ -184,6 +192,12 @@
 treeSelectionUnselectPath ts tp =
   {#call tree_selection_unselect_path#} (toTreeSelection ts) tp
 
+-- | Returns True if the row at the given path is currently selected.
+--
+treeSelectionPathIsSelected :: (TreeSelectionClass ts) => ts -> TreePath -> IO Bool
+treeSelectionPathIsSelected ts tp = liftM toBool $
+  {#call unsafe tree_selection_path_is_selected#} (toTreeSelection ts) tp
+
 -- | Select a specific item by TreeIter.
 --
 treeSelectionSelectIter :: (TreeSelectionClass ts) => ts -> TreeIter -> IO ()
@@ -196,6 +210,11 @@
 treeSelectionUnselectIter ts ti =
   {#call tree_selection_unselect_iter#} (toTreeSelection ts) ti
 
+-- | Returns True if the row at the given iter is currently selected.
+--
+treeSelectionIterIsSelected :: (TreeSelectionClass ts) => ts -> TreeIter -> IO Bool
+treeSelectionIterIsSelected ts ti = liftM toBool $
+  {#call unsafe tree_selection_iter_is_selected#} (toTreeSelection ts) ti
 
 -- | Select everything.
 --

[Gtk2hs-commit] gtk2hs/gtk/abstract Container.chs,1.7,1.8 api.ignore,1.2,1.3

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

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

Modified Files:
	Container.chs api.ignore 
Log Message:
Add missing functions and list more ignored functions.


Index: Container.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/abstract/Container.chs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Container.chs	23 May 2004 15:46:02 -0000	1.7
+++ Container.chs	4 Aug 2004 18:41:43 -0000	1.8
@@ -25,12 +25,7 @@
 -- This abstract widget implements the basis for turning serveral widgets
 -- into one compound widget.
 --
--- TODO
---
--- * Check if the following functions are of interest to the user:
---   containerSetReallocateRedraws, containerQueueResize, 
---   conatinerClearResizeWidgets
---
+
 module Container(
   Container,
   ContainerClass,
@@ -38,14 +33,21 @@
   containerAdd,
   containerRemove,
   containerForeach,
+  containerGetChildren,
   DirectionType(..),
---  containerFocus,
   containerSetFocusChild,
+  containerSetFocusChain,
+  containerGetFocusChain,
+  containerUnsetFocusChain,
   containerSetFocusVAdjustment,
+  containerGetFocusVAdjustment,
   containerSetFocusHAdjustment,
+  containerGetFocusHAdjustment,
   containerResizeChildren,
---  containerChildCompositeName,
   containerSetBorderWidth,
+  containerGetBorderWidth,
+  containerChildSetProperty,
+  containerChildGetProperty,
   onAdd,
   afterAdd,
   onCheckResize,
@@ -65,6 +67,8 @@
 import Object	(makeNewObject)
 {#import Hierarchy#}
 {#import Signal#}
+import GList  (fromGList, toGList)
+{#import GValue#} (GValue, GenericValue, valueUnset)
 import Enums	(DirectionType(..))
 
 
@@ -116,19 +120,13 @@
 
 #endif
 
-{-
--- | Give the focus to the container.
--- * The @direction@ argument determines what kind of focus 
--- change is to be
---   simulated.
---
--- * The returned boolean value is the value returned from the 
--- @\"focus\"@ signal emission.
+-- | Returns the the container's children.
 --
---containerFocus :: ContainerClass c => DirectionType -> c -> IO Bool
---containerFocus direction con = liftM toBool $ {#call container_focus#} 
---  (toContainer con) ((fromIntegral.fromEnum) direction)
--}
+containerGetChildren :: ContainerClass c => c -> IO [Widget]
+containerGetChildren con = do
+  glist <- {#call container_get_children#} (toContainer con)
+  widgetPtrs <- fromGList glist
+  mapM (makeNewObject mkWidget . return) widgetPtrs
 
 -- | Give the focus to a specific child of the
 -- container.
@@ -137,51 +135,121 @@
 containerSetFocusChild con widget =
   {#call container_set_focus_child#} (toContainer con) (toWidget widget)
 
+-- | Sets a focus chain, overriding the one computed automatically by GTK+.
+--
+containerSetFocusChain :: ContainerClass c => c -> [Widget] -> IO ()
+containerSetFocusChain con chain =
+  let wForeignPtrs = map (\w -> case toWidget w of Widget ptr -> ptr) chain in
+  withForeignPtrs wForeignPtrs $ \wPtrs -> do
+  glist <- toGList wPtrs
+  {#call container_set_focus_chain#} (toContainer con) glist
 
--- | Install an @adjustment@
--- widget that is queried when focus is changed.
+withForeignPtrs :: [ForeignPtr a] -> ([Ptr a] -> IO b) -> IO b
+withForeignPtrs = withForeignPtrs' []
+  where withForeignPtrs' accum []     cont = cont (reverse accum)
+        withForeignPtrs' accum (p:ps) cont = withForeignPtr p $ \p' ->
+                                             withForeignPtrs' (p':accum) ps cont
+
+-- | Retrieves the focus chain of the container, if one has been set explicitly.
+--
+containerGetFocusChain :: ContainerClass c => c -> IO (Maybe [Widget])
+containerGetFocusChain con =
+  alloca $ \glistPtr -> do
+  {#call container_get_focus_chain#} (toContainer con) glistPtr
+  if glistPtr == nullPtr then return Nothing else liftM Just $ do
+    glist <- peek glistPtr
+    widgetPtrs <- fromGList glist
+    mapM (makeNewObject mkWidget . return) widgetPtrs
+
+-- | Removes a focus chain explicitly set with 'containerSetFocusChain'.
+--
+containerUnsetFocusChain :: ContainerClass c => c -> IO ()
+containerUnsetFocusChain con =
+  {#call container_unset_focus_chain#} (toContainer con)
+
+-- | Install an adjustment widget that is queried when focus is changed.
 --
 containerSetFocusVAdjustment :: (ContainerClass c, AdjustmentClass a) => c ->
                                 a -> IO ()
 containerSetFocusVAdjustment con adj =
   {#call container_set_focus_vadjustment#} (toContainer con) (toAdjustment adj)
 
--- | Install an @adjustment@
--- widget that is queried when focus is changed.
+-- | Retrieves the vertical focus adjustment for the container, or Nothing if
+-- none has been set.
+--
+containerGetFocusVAdjustment :: ContainerClass c => c -> IO (Maybe Adjustment)
+containerGetFocusVAdjustment con = do
+  aPtr <- {#call unsafe container_get_focus_vadjustment#} (toContainer con)
+  if aPtr==nullPtr then return Nothing else liftM Just $
+    makeNewObject mkAdjustment (return aPtr)
+
+-- | Install an adjustment widget that is queried when focus is changed.
 --
 containerSetFocusHAdjustment :: (ContainerClass c, AdjustmentClass a) => c ->
                                 a -> IO ()
 containerSetFocusHAdjustment con adj =
   {#call container_set_focus_hadjustment#} (toContainer con) (toAdjustment adj)
 
+-- | Retrieves the horizontal focus adjustment for the container, or Nothing if
+-- none has been set.
+--
+containerGetFocusHAdjustment :: ContainerClass c => c -> IO (Maybe Adjustment)
+containerGetFocusHAdjustment con = do
+  aPtr <- {#call unsafe container_get_focus_hadjustment#} (toContainer con)
+  if aPtr==nullPtr then return Nothing else liftM Just $
+    makeNewObject mkAdjustment (return aPtr)
+
 -- | Make the container resize its children.
 --
 containerResizeChildren :: ContainerClass c => c -> IO ()
 containerResizeChildren con =
   {#call container_resize_children#} (toContainer con)
 
-{-
--- | Query the composite name of a 
--- widget in this container.
--- *  
---containerChildCompositeName :: (ContainerClass c, WidgetClass w) =>
---  w -> c -> IO String
---containerChildCompositeName widget con = do
---  strPtr <- throwIfNull "containerChildCompositeName: illegal name returned" $
---    {#call unsafe container_child_composite_name#} (toContainer con) 
---    (toWidget widget)
---  str <- peekUTFString strPtr
---  {#call unsafe g_free#} (castPtr strPtr)
---  return str
--}
-
--- | Set the amount of empty space around the
--- outside of the container.
+-- | Set the amount of empty space around the outside of the container.
+--
+-- The border width of a container is the amount of space to leave around the
+-- outside of the container. The border is added on all sides of the container.
 --
 containerSetBorderWidth :: ContainerClass c => c -> Int -> IO ()
 containerSetBorderWidth con width =
   {#call container_set_border_width#} (toContainer con) (fromIntegral width)
 
+-- | Retrieves the border width of the container. See 'containerSetBorderWidth'.
+--
+containerGetBorderWidth :: ContainerClass c => c -> IO Int
+containerGetBorderWidth con = liftM fromIntegral $
+  {#call unsafe container_get_border_width#} (toContainer con)
+
+-- TODO add doc on what child properties are
+
+-- | Sets a child property for child and container.
+--
+containerChildSetProperty :: (ContainerClass c, WidgetClass widget) => c
+                          -> widget       -- ^ Chile widget
+                          -> String       -- ^ Property name
+                          -> GenericValue -- ^ Property value
+                          -> IO ()
+containerChildSetProperty con child prop val =
+  alloca $ \valPtr ->
+  withUTFString prop $ \strPtr -> do
+  poke valPtr val
+  {#call container_child_set_property#} (toContainer con)
+    (toWidget child) strPtr valPtr
+
+-- | Gets the value of a child property for the given child and container.
+--
+containerChildGetProperty :: (ContainerClass c, WidgetClass widget) => c
+                          -> widget  -- ^ Child widget
+                          -> String  -- ^ Property name
+                          -> IO GenericValue
+containerChildGetProperty con child prop =
+  alloca $ \valPtr ->
+  withUTFString prop $ \strPtr -> do
+  {#call unsafe container_child_get_property#} (toContainer con)
+    (toWidget child) strPtr valPtr
+  res <- peek valPtr
+  valueUnset valPtr
+  return res
 
 -- signals
 

Index: api.ignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/abstract/api.ignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- api.ignore	1 Aug 2004 16:08:14 -0000	1.2
+++ api.ignore	4 Aug 2004 18:41:59 -0000	1.3
@@ -13,12 +13,17 @@
 exclude gtk_container_class
 exclude gtk_container_propagate_expose
 exclude gtk_container_forall
+exclude gtk_container_set_reallocate_redraws
 exclude gtk_scale_get_layout
+exclude gtk_container_[gs]et_resize_mode
 
 #somewhat internal api
 exclude gtk_container_child
 do not exclude gtk_container_child_[sg]et_property
 
+#undocumented can't see what it does
+exclude gtk_container_check_resize
+
 #internal function
 exclude gtk_paned_compute_position
 
@@ -43,4 +48,41 @@
 exclude gtk_widget_child_focus
 exclude gtk_widget_get_child_visible
 exclude gtk_widget_set_child_visible
+exclude gtk_widget_set_parent
+exclude gtk_widget_set_colormap
+exclude gtk_widget_push_colormap
+exclude gtk_widget_pop_colormap
+exclude gtk_widget_set_default_colormap
+exclude gtk_widget_reset_rc_styles
+exclude gtk_widget_push_composite_child
+exclude gtk_widget_pop_composite_child
+exclude gtk_widget_freeze_child_notify
+exclude gtk_widget_thaw_child_notify
+exclude gtk_widget_set_double_buffered
+exclude gtk_widget_send_expose
+exclude gtk_widget_region_intersect
+exclude gtk_widget_child_notify
+
+# undocumented widget functions, don't seem useful
+exclude gtk_widget_reset_shapes
+exclude gtk_widget_set_app_paintable
+
+# C convenience functions that we don't need
+exclude gtk_widget_new
+exclude gtk_widget_ref
+exclude gtk_widget_unref
+exclude gtk_widget_destroy
+exclude gtk_widget_destroyed
+exclude gtk_widget_style_get
+exclude gtk_widget_hide_on_delete
 
+# we've not bound GtkStlye --TODO should we?
+exclude gtk_widget_get_default_style
+exclude gtk_widget_set_style
+exclude gtk_widget_ensure_style
+exclude gtk_widget_get_style
+exclude gtk_widget_modify_style
+exclude gtk_widget_get_modifier_style
+
+# we probably don't need Atk stuff
+exclude gtk_widget_get_accessible

[Gtk2hs-commit] gtk2hs/gtk/glib .cvsignore,1.4,1.5

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

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

Modified Files:
	.cvsignore 
Log Message:
Add and update many .cvsignore files.
Add a few api.ignore files that I forgot to add before.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/glib/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	10 Jul 2003 00:45:50 -0000	1.4
+++ .cvsignore	3 Aug 2004 16:56:56 -0000	1.5
@@ -1,5 +1,7 @@
+GError.hs
 GList.hs
 GObject.hs
+GParameter.hs
 GType.hs
 GValue.hs
 GValueTypes.hs

[Gtk2hs-commit] gtk2hs/gtk/gdk .cvsignore,1.4,1.5

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

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

Modified Files:
	.cvsignore 
Log Message:
Add and update many .cvsignore files.
Add a few api.ignore files that I forgot to add before.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/gdk/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	10 Jul 2003 00:45:50 -0000	1.4
+++ .cvsignore	3 Aug 2004 16:56:55 -0000	1.5
@@ -4,5 +4,6 @@
 Gdk.hs
 GdkEnums.hs
 GdkKeys.hs
+Pixbuf.hs
 Keys.hs
 Region.hs

[Gtk2hs-commit] gtk2hs/gtk/entry .cvsignore,1.4,1.5

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

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

Modified Files:
	.cvsignore 
Log Message:
Add and update many .cvsignore files.
Add a few api.ignore files that I forgot to add before.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/entry/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	10 Jul 2003 00:45:50 -0000	1.4
+++ .cvsignore	3 Aug 2004 16:56:55 -0000	1.5
@@ -1,4 +1,6 @@
+Editable.hs
 Entry.hs
+EntryCompletion.hs
 HScale.hs
 SpinButton.hs
 VScale.hs

[Gtk2hs-commit] gtk2hs/gtk/abstract .cvsignore,1.4,1.5

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

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

Modified Files:
	.cvsignore 
Log Message:
Add and update many .cvsignore files.
Add a few api.ignore files that I forgot to add before.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/abstract/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	10 Jul 2003 00:45:50 -0000	1.4
+++ .cvsignore	3 Aug 2004 16:56:54 -0000	1.5
@@ -1,5 +1,8 @@
+Bin.hs
 Box.hs
+ButtonBox.hs
 Container.hs
+FileChooser.hs
 Misc.hs
 Object.hs
 Paned.hs

[Gtk2hs-commit] gtk2hs ChangeLog,1.208,1.209

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

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

Modified Files:
	ChangeLog 
Log Message:
Add and update many .cvsignore files.
Add a few api.ignore files that I forgot to add before.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- ChangeLog	3 Aug 2004 04:26:08 -0000	1.208
+++ ChangeLog	3 Aug 2004 16:56:49 -0000	1.209
@@ -46,6 +46,20 @@
 	* demo/profileviewer/Makefile, demo/profileviewer/ProfileViewer.hs: fix
 	bug in demo and rename executable to be consistent.
 
+	* gtk/buttons/api.ignore, gtk/display/api.ignore,
+	gtk/embedding/api.ignore: mark deprecated and unued functions (oops 
+	forgot to commit these before).
+
+	* demo/filechooser/.cvsignore, demo/gconf/.cvsignore,
+	demo/glade/.cvsignore, gconf/System/Gnome/GConf/.cvsignore,
+	glade/.cvsignore, gtk/selectors/.cvsignore, sourceview/.cvsignore,
+	tools/apicoverage/.cvsignore, tools/callbackGen/.cvsignore,
+	tools/hierarchyGen/.cvsignore, gtk/abstract/.cvsignore,
+	gtk/entry/.cvsignore, gtk/gdk/.cvsignore, gtk/glib/.cvsignore,
+	gtk/layout/.cvsignore, gtk/menuComboToolbar/.cvsignore,
+	gtk/misc/.cvsignore, gtk/windows/.cvsignore: add and update .cvsignore
+	files so our cvs updates are less noisy.
+
 2004-08-1  Duncan Coutts <du...@co...>
 
 	* gtk/entry/SpinButton.chs, gtk/layout/Table.chs, gtk/layout/Layout.chs

[Gtk2hs-commit] gtk2hs/gtk/misc .cvsignore,1.4,1.5

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

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

Modified Files:
	.cvsignore 
Log Message:
Add and update many .cvsignore files.
Add a few api.ignore files that I forgot to add before.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/misc/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	10 Jul 2003 00:45:51 -0000	1.4
+++ .cvsignore	3 Aug 2004 16:56:57 -0000	1.5
@@ -6,4 +6,7 @@
 HandleBox.hs
 Tooltips.hs
 Viewport.hs
+FileChooserWidget.hs
+GArrow.hs
+SizeGroup.hs
 *.h

[Gtk2hs-commit] gtk2hs/gtk/layout .cvsignore,1.4,1.5

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

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

Modified Files:
	.cvsignore 
Log Message:
Add and update many .cvsignore files.
Add a few api.ignore files that I forgot to add before.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/layout/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	10 Jul 2003 00:45:51 -0000	1.4
+++ .cvsignore	3 Aug 2004 16:56:56 -0000	1.5
@@ -1,10 +1,14 @@
 Alignment.hs
 AspectFrame.hs
+Expander.hs
+Fixed.hs
 HBox.hs
+HButtonBox.hs
 HPaned.hs
 Layout.hs
 Notebook.hs
 Table.hs
 VBox.hs
+VButtonBox.hs
 VPaned.hs
 *.h

[Gtk2hs-commit] gtk2hs/gtk/menuComboToolbar .cvsignore,1.4,1.5

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

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

Modified Files:
	.cvsignore 
Log Message:
Add and update many .cvsignore files.
Add a few api.ignore files that I forgot to add before.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/menuComboToolbar/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	10 Jul 2003 00:45:51 -0000	1.4
+++ .cvsignore	3 Aug 2004 16:56:57 -0000	1.5
@@ -1,5 +1,7 @@
 CheckMenuItem.hs
 Combo.hs
+ComboBox.hs
+ComboBoxEntry.hs
 ImageMenuItem.hs
 Menu.hs
 MenuBar.hs
@@ -9,4 +11,5 @@
 RadioMenuItem.hs
 TearoffMenuItem.hs
 Toolbar.hs
+ToolItem.hs
 *.h

[Gtk2hs-commit] gtk2hs/gtk/windows .cvsignore,1.4,1.5

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

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

Modified Files:
	.cvsignore 
Log Message:
Add and update many .cvsignore files.
Add a few api.ignore files that I forgot to add before.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/windows/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	10 Jul 2003 00:45:52 -0000	1.4
+++ .cvsignore	3 Aug 2004 16:56:57 -0000	1.5
@@ -1,4 +1,5 @@
 Dialog.hs
+FileChooserDialog.hs
 FileSel.hs
 Plug.hs
 Window.hs

[Gtk2hs-commit] gtk2hs/tools/hierarchyGen .cvsignore,NONE,1.1

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

Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26639/tools/hierarchyGen

Added Files:
	.cvsignore 
Log Message:
Add and update many .cvsignore files.
Add a few api.ignore files that I forgot to add before.


--- NEW FILE: .cvsignore ---
TypeGenerator

[Gtk2hs-commit] gtk2hs/glade .cvsignore,NONE,1.1

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

Update of /cvsroot/gtk2hs/gtk2hs/glade
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26639/glade

Added Files:
	.cvsignore 
Log Message:
Add and update many .cvsignore files.
Add a few api.ignore files that I forgot to add before.


--- NEW FILE: .cvsignore ---
Glade.hs
GladeType.*