[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Scrolling ScrolledWindow.chs,1.6,1.7

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

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

Modified Files:
	ScrolledWindow.chs 
Log Message:
Trivial changes merged from the generated modules.


Index: ScrolledWindow.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ScrolledWindow.chs	24 Mar 2005 15:16:18 -0000	1.6
+++ ScrolledWindow.chs	2 Apr 2005 19:57:13 -0000	1.7
@@ -133,11 +133,8 @@
   makeNewObject mkScrolledWindow $
   liftM (castPtr :: Ptr Widget -> Ptr ScrolledWindow) $
   {# call unsafe scrolled_window_new #}
-    (fromMAdj hadjustment)
-    (fromMAdj vadjustment)
- where
- fromMAdj :: Maybe Adjustment -> Adjustment
- fromMAdj = fromMaybe $ mkAdjustment nullForeignPtr
+    (fromMaybe (Adjustment nullForeignPtr) hadjustment)
+    (fromMaybe (Adjustment nullForeignPtr) vadjustment)
 
 --------------------
 -- Methods
@@ -145,8 +142,7 @@
 -- | Returns the horizontal scrollbar's adjustment, used to connect the
 -- horizontal scrollbar to the child widget's horizontal scroll functionality.
 --
-scrolledWindowGetHAdjustment :: ScrolledWindowClass self => self
- -> IO Adjustment
+scrolledWindowGetHAdjustment :: ScrolledWindowClass self => self -> IO Adjustment
 scrolledWindowGetHAdjustment self =
   makeNewObject mkAdjustment $
   {# call unsafe scrolled_window_get_hadjustment #}
@@ -155,8 +151,7 @@
 -- | Returns the vertical scrollbar's adjustment, used to connect the vertical
 -- scrollbar to the child widget's vertical scroll functionality.
 --
-scrolledWindowGetVAdjustment :: ScrolledWindowClass self => self
- -> IO Adjustment
+scrolledWindowGetVAdjustment :: ScrolledWindowClass self => self -> IO Adjustment
 scrolledWindowGetVAdjustment self =
   makeNewObject mkAdjustment $
   {# call unsafe scrolled_window_get_vadjustment #}
@@ -232,8 +227,7 @@
 -- | Gets the placement of the scrollbars for the scrolled window. See
 -- 'scrolledWindowSetPlacement'.
 --
-scrolledWindowGetPlacement :: ScrolledWindowClass self => self
- -> IO CornerType
+scrolledWindowGetPlacement :: ScrolledWindowClass self => self -> IO CornerType
 scrolledWindowGetPlacement self =
   liftM (toEnum . fromIntegral) $
   {# call unsafe scrolled_window_get_placement #}
@@ -241,9 +235,7 @@
 
 -- | Changes the type of shadow drawn around the contents of @scrolledWindow@.
 --
-scrolledWindowSetShadowType :: ScrolledWindowClass self => self
- -> ShadowType
- -> IO ()
+scrolledWindowSetShadowType :: ScrolledWindowClass self => self -> ShadowType -> IO ()
 scrolledWindowSetShadowType self type_ =
   {# call scrolled_window_set_shadow_type #}
     (toScrolledWindow self)
@@ -252,8 +244,7 @@
 -- | Gets the shadow type of the scrolled window. See
 -- 'scrolledWindowSetShadowType'.
 --
-scrolledWindowGetShadowType :: ScrolledWindowClass self => self
- -> IO ShadowType
+scrolledWindowGetShadowType :: ScrolledWindowClass self => self -> IO ShadowType
 scrolledWindowGetShadowType self =
   liftM (toEnum . fromIntegral) $
   {# call unsafe scrolled_window_get_shadow_type #}
@@ -261,9 +252,7 @@
 
 -- | Sets the 'Adjustment' for the horizontal scrollbar.
 --
-scrolledWindowSetHAdjustment :: ScrolledWindowClass self => self
- -> Adjustment
- -> IO ()
+scrolledWindowSetHAdjustment :: ScrolledWindowClass self => self -> Adjustment -> IO ()
 scrolledWindowSetHAdjustment self hadjustment =
   {# call scrolled_window_set_hadjustment #}
     (toScrolledWindow self)
@@ -271,9 +260,7 @@
 
 -- | Sets the 'Adjustment' for the vertical scrollbar.
 --
-scrolledWindowSetVAdjustment :: ScrolledWindowClass self => self
- -> Adjustment
- -> IO ()
+scrolledWindowSetVAdjustment :: ScrolledWindowClass self => self -> Adjustment -> IO ()
 scrolledWindowSetVAdjustment self vadjustment =
   {# call scrolled_window_set_vadjustment #}
     (toScrolledWindow self)