[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Layout Alignment.chs.pp,1.4,1.5 Expander.chs.pp,1.6,1.7 Notebook.chs.pp,1.5,1.6

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

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Layout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3801/gtk/Graphics/UI/Gtk/Layout

Modified Files:
	Alignment.chs.pp Expander.chs.pp Notebook.chs.pp 
Log Message:
Trivial changes merged from the generated modules.


Index: Expander.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Layout/Expander.chs.pp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Expander.chs.pp	24 Mar 2005 17:30:59 -0000	1.6
+++ Expander.chs.pp	2 Apr 2005 19:51:44 -0000	1.7
@@ -102,7 +102,7 @@
 --------------------
 -- Constructors
 
--- | Creates a new expander using @label@ as the text of the label.
+-- | Creates a new expander using the given string as the text of the label.
 --
 expanderNew :: String -> IO Expander
 expanderNew label =
@@ -157,8 +157,7 @@
 -- | Sets the spacing field of @expander@, which is the number of pixels to
 -- place between expander and the child.
 --
-expanderSetSpacing :: Expander -> Int
- -> IO ()
+expanderSetSpacing :: Expander -> Int -> IO ()
 expanderSetSpacing self spacing =
   {# call gtk_expander_set_spacing #}
     self

Index: Alignment.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Layout/Alignment.chs.pp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Alignment.chs.pp	24 Mar 2005 17:30:59 -0000	1.4
+++ Alignment.chs.pp	2 Apr 2005 19:51:44 -0000	1.5
@@ -164,20 +164,20 @@
                             -- paddingRight)@ - the padding at the top,
                             -- bottom, left and right of the widget.
 alignmentGetPadding self =
-  alloca $ \topPtr ->
-  alloca $ \bottomPtr ->
-  alloca $ \leftPtr ->
-  alloca $ \rightPtr -> do
+  alloca $ \paddingTopPtr ->
+  alloca $ \paddingBottomPtr ->
+  alloca $ \paddingLeftPtr ->
+  alloca $ \paddingRightPtr -> do
   {# call gtk_alignment_get_padding #}
     (toAlignment self)
-    topPtr
-    bottomPtr
-    leftPtr
-    rightPtr
-  top    <- peek topPtr
-  bottom <- peek bottomPtr
-  left   <- peek leftPtr
-  right  <- peek rightPtr
-  return (fromIntegral top, fromIntegral bottom
-         ,fromIntegral left, fromIntegral right)
+    paddingTopPtr
+    paddingBottomPtr
+    paddingLeftPtr
+    paddingRightPtr
+  paddingTop <- peek paddingTopPtr
+  paddingBottom <- peek paddingBottomPtr
+  paddingLeft <- peek paddingLeftPtr
+  paddingRight <- peek paddingRightPtr
+  return (fromIntegral paddingTop, fromIntegral paddingBottom
+         ,fromIntegral paddingLeft, fromIntegral paddingRight)
 #endif

Index: Notebook.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Layout/Notebook.chs.pp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Notebook.chs.pp	24 Mar 2005 17:31:00 -0000	1.5
+++ Notebook.chs.pp	2 Apr 2005 19:51:44 -0000	1.6
@@ -805,7 +805,7 @@
     (toWidget child)
     (fromBool $ pack/=PackNatural)
     (fromBool $ pack==PackGrow) 
-    ((fromIntegral.fromEnum) packType)
+    ((fromIntegral . fromEnum) packType)
 
 #ifndef DISABLE_DEPRECATED
 -- | Sets whether the tabs must have all the same size or not.