[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/Abstract Box.chs,1.6,1.7 Object.chs.pp,1.3,1.4 Paned.chs.pp,1.6,1.7 Range.chs,1.7,1.8 Scale.chs,1.6,1.7 ButtonBox.chs.pp,1.5,1.6

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

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

Modified Files:
	Box.chs Object.chs.pp Paned.chs.pp Range.chs Scale.chs 
	ButtonBox.chs.pp 
Log Message:
Minor changes. Mostly generalising the types of attributes.
For ButtonBox, rename attribute buttonBoxLayout to buttonBoxLayoutStyle.


Index: Range.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Abstract/Range.chs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Range.chs	15 Mar 2005 19:49:40 -0000	1.7
+++ Range.chs	2 Apr 2005 19:02:23 -0000	1.8
@@ -221,14 +221,14 @@
 --
 -- Default value: 'UpdateContinuous'
 --
-rangeUpdatePolicy :: Attr Range UpdateType
+rangeUpdatePolicy :: RangeClass self => Attr self UpdateType
 rangeUpdatePolicy = Attr 
   rangeGetUpdatePolicy
   rangeSetUpdatePolicy
 
 -- | The 'Adjustment' that contains the current value of this range object.
 --
-rangeAdjustment :: Attr Range Adjustment
+rangeAdjustment :: RangeClass self => Attr self Adjustment
 rangeAdjustment = Attr 
   rangeGetAdjustment
   rangeSetAdjustment
@@ -237,14 +237,14 @@
 --
 -- Default value: @False@
 --
-rangeInverted :: Attr Range Bool
+rangeInverted :: RangeClass self => Attr self Bool
 rangeInverted = Attr 
   rangeGetInverted
   rangeSetInverted
 
 -- | \'value\' property. See 'rangeGetValue' and 'rangeSetValue'
 --
-rangeValue :: Attr Range Double
+rangeValue :: RangeClass self => Attr self Double
 rangeValue = Attr 
   rangeGetValue
   rangeSetValue

Index: Object.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Abstract/Object.chs.pp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Object.chs.pp	25 Feb 2005 01:11:31 -0000	1.3
+++ Object.chs.pp	2 Apr 2005 19:02:22 -0000	1.4
@@ -31,7 +31,7 @@
 --   in each widget file.
 --
 module Graphics.UI.Gtk.Abstract.Object (
--- * Description
+-- * Detail
 -- 
 -- | 'Object' is the base class for all widgets, and for a few non-widget
 -- objects such as 'Adjustment'. 'Object' predates 'GObject'; non-widgets that

Index: ButtonBox.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Abstract/ButtonBox.chs.pp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ButtonBox.chs.pp	14 Mar 2005 23:55:07 -0000	1.5
+++ ButtonBox.chs.pp	2 Apr 2005 19:02:23 -0000	1.6
@@ -74,7 +74,7 @@
 #endif
 
 -- * Properties
-  buttonBoxLayout
+  buttonBoxLayoutStyle
   ) where
 
 import Monad (liftM)
@@ -93,8 +93,7 @@
 
 -- | Retrieves the method being used to arrange the buttons in the button box.
 --
-buttonBoxGetLayout :: ButtonBoxClass self => self
- -> IO ButtonBoxStyle
+buttonBoxGetLayout :: ButtonBoxClass self => self -> IO ButtonBoxStyle
 buttonBoxGetLayout self =
   liftM (toEnum . fromIntegral) $
   {# call gtk_button_box_get_layout #}
@@ -130,9 +129,9 @@
 -- typical use of a secondary child is the help button in a dialog.
 --
 -- This group appears after the other children if the style is
--- 'ButtonboxStart', 'ButtonboxSpread' or 'ButtonboxEdge', and before the the
--- other children if the style is 'ButtonboxEnd'. For horizontal button boxes,
--- the definition of before\/after depends on direction of the widget (see
+-- 'ButtonboxStart', 'ButtonboxSpread' or 'ButtonboxEdge', and before the other
+-- children if the style is 'ButtonboxEnd'. For horizontal button boxes, the
+-- definition of before\/after depends on direction of the widget (see
 -- 'widgetSetDirection'). If the style is 'ButtonboxStart' or 'ButtonboxEnd',
 -- then the secondary children are aligned at the other end of the button box
 -- from the main children. For the other styles, they appear immediately next
@@ -157,7 +156,7 @@
 --
 -- Default value: 'ButtonboxDefaultStyle'
 --
-buttonBoxLayout :: Attr ButtonBox ButtonBoxStyle
-buttonBoxLayout = Attr 
+buttonBoxLayoutStyle :: ButtonBoxClass self => Attr self ButtonBoxStyle
+buttonBoxLayoutStyle = Attr 
   buttonBoxGetLayout
   buttonBoxSetLayout

Index: Paned.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Abstract/Paned.chs.pp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Paned.chs.pp	14 Mar 2005 23:55:07 -0000	1.6
+++ Paned.chs.pp	2 Apr 2005 19:02:22 -0000	1.7
@@ -205,7 +205,7 @@
 --
 -- Default value: 0
 --
-panedPosition :: Attr Paned Int
+panedPosition :: PanedClass self => Attr self Int
 panedPosition = Attr 
   panedGetPosition
   panedSetPosition

Index: Box.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Abstract/Box.chs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Box.chs	14 Mar 2005 23:55:07 -0000	1.6
+++ Box.chs	2 Apr 2005 19:02:21 -0000	1.7
@@ -323,7 +323,7 @@
 --
 -- Default value: 0
 --
-boxSpacing :: Attr Box Int
+boxSpacing :: BoxClass self => Attr self Int
 boxSpacing = Attr 
   boxGetSpacing
   boxSetSpacing
@@ -332,7 +332,7 @@
 --
 -- Default value: @False@
 --
-boxHomogeneous :: Attr Box Bool
+boxHomogeneous :: BoxClass self => Attr self Bool
 boxHomogeneous = Attr 
   boxGetHomogeneous
   boxSetHomogeneous

Index: Scale.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/Abstract/Scale.chs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Scale.chs	14 Mar 2005 23:55:07 -0000	1.6
+++ Scale.chs	2 Apr 2005 19:02:23 -0000	1.7
@@ -158,7 +158,7 @@
 --
 -- Default value: 1
 --
-scaleDigits :: Attr Scale Int
+scaleDigits :: ScaleClass self => Attr self Int
 scaleDigits = Attr 
   scaleGetDigits
   scaleSetDigits
@@ -167,7 +167,7 @@
 --
 -- Default value: @False@
 --
-scaleDrawValue :: Attr Scale Bool
+scaleDrawValue :: ScaleClass self => Attr self Bool
 scaleDrawValue = Attr 
   scaleGetDrawValue
   scaleSetDrawValue
@@ -176,7 +176,7 @@
 --
 -- Default value: 'PosLeft'
 --
-scaleValuePos :: Attr Scale PositionType
+scaleValuePos :: ScaleClass self => Attr self PositionType
 scaleValuePos = Attr 
   scaleGetValuePos
   scaleSetValuePos