gtk 0.13.7 → 0.13.8

raw patch · 177 files changed

+1444/−1409 lines, 177 files

Files

Graphics/UI/Gtk.chs +9/−9
Graphics/UI/Gtk/Abstract/Box.chs +2/−2
Graphics/UI/Gtk/Abstract/Container.chs +4/−4
Graphics/UI/Gtk/Abstract/ContainerChildProperties.chs +2/−2
Graphics/UI/Gtk/Abstract/IMContext.chs +1/−1
Graphics/UI/Gtk/Abstract/Paned.chs +3/−3
Graphics/UI/Gtk/Abstract/Range.chs +5/−5
Graphics/UI/Gtk/Abstract/Scale.chs +2/−2
Graphics/UI/Gtk/Abstract/Widget.chs +20/−20
Graphics/UI/Gtk/ActionMenuToolbar/Action.chs +2/−2
Graphics/UI/Gtk/ActionMenuToolbar/ActionGroup.chs +5/−5
Graphics/UI/Gtk/ActionMenuToolbar/RadioAction.chs +1/−1
Graphics/UI/Gtk/ActionMenuToolbar/RecentAction.chs +1/−1
Graphics/UI/Gtk/ActionMenuToolbar/ToggleAction.chs +1/−1
Graphics/UI/Gtk/ActionMenuToolbar/UIManager.chs +3/−3
Graphics/UI/Gtk/Buttons/Button.chs +3/−3
Graphics/UI/Gtk/Buttons/CheckButton.chs +2/−2
Graphics/UI/Gtk/Buttons/LinkButton.chs +2/−2
Graphics/UI/Gtk/Buttons/RadioButton.chs +2/−2
Graphics/UI/Gtk/Buttons/ScaleButton.chs +3/−3
Graphics/UI/Gtk/Buttons/ToggleButton.chs +2/−2
Graphics/UI/Gtk/Buttons/VolumeButton.chs +2/−2
Graphics/UI/Gtk/Display/AccelLabel.chs +2/−2
Graphics/UI/Gtk/Display/Image.chs +3/−3
Graphics/UI/Gtk/Display/InfoBar.chs +2/−2
Graphics/UI/Gtk/Display/ProgressBar.chs +4/−4
Graphics/UI/Gtk/Display/Spinner.chs +2/−2
Graphics/UI/Gtk/Display/StatusIcon.chs +1/−1
Graphics/UI/Gtk/Display/Statusbar.chs +2/−2
Graphics/UI/Gtk/Embedding/Embedding.hsc +1/−1
Graphics/UI/Gtk/Embedding/Plug.chs +3/−3
Graphics/UI/Gtk/Embedding/Socket.chs +2/−2
Graphics/UI/Gtk/Entry/Entry.chs +12/−7
Graphics/UI/Gtk/Entry/EntryBuffer.chs +1/−1
Graphics/UI/Gtk/Entry/EntryCompletion.chs +1/−1
Graphics/UI/Gtk/Entry/HScale.chs +2/−2
Graphics/UI/Gtk/Entry/SpinButton.chs +4/−4
Graphics/UI/Gtk/Entry/VScale.chs +2/−2
Graphics/UI/Gtk/Gdk/Display.chs +1/−1
Graphics/UI/Gtk/Gdk/Drawable.chs +11/−11
Graphics/UI/Gtk/Gdk/Enums.chs +3/−3
Graphics/UI/Gtk/Gdk/EventM.hsc +15/−15
Graphics/UI/Gtk/Gdk/Events.hsc +140/−140
Graphics/UI/Gtk/Gdk/GC.chs +7/−7
Graphics/UI/Gtk/Gdk/Gdk.chs +6/−4
Graphics/UI/Gtk/Gdk/Keymap.chs +3/−3
Graphics/UI/Gtk/Gdk/Pixbuf.chs +9/−9
Graphics/UI/Gtk/Gdk/PixbufAnimation.chs +1/−1
Graphics/UI/Gtk/Gdk/Region.chs +3/−3
Graphics/UI/Gtk/Gdk/Screen.chs +1/−1
Graphics/UI/Gtk/General/DNDTypes.chs +2/−2
Graphics/UI/Gtk/General/Drag.chs +2/−2
Graphics/UI/Gtk/General/Enums.chs +15/−15
Graphics/UI/Gtk/General/General.chs +5/−4
Graphics/UI/Gtk/General/IconFactory.chs +5/−4
Graphics/UI/Gtk/General/IconTheme.chs +1/−1
Graphics/UI/Gtk/General/RcStyle.chs +1/−1
Graphics/UI/Gtk/General/Selection.chs +1/−1
Graphics/UI/Gtk/General/StockItems.hsc +221/−221
Graphics/UI/Gtk/General/Structs.hsc +73/−54
Graphics/UI/Gtk/General/Style.chs +9/−9
Graphics/UI/Gtk/Layout/Alignment.chs +2/−2
Graphics/UI/Gtk/Layout/AspectFrame.chs +3/−3
Graphics/UI/Gtk/Layout/Fixed.chs +2/−2
Graphics/UI/Gtk/Layout/HBox.chs +2/−2
Graphics/UI/Gtk/Layout/HPaned.chs +2/−2
Graphics/UI/Gtk/Layout/Layout.chs +3/−3
Graphics/UI/Gtk/Layout/Notebook.chs +8/−8
Graphics/UI/Gtk/Layout/Table.chs +4/−4
Graphics/UI/Gtk/Layout/VBox.chs +2/−2
Graphics/UI/Gtk/Layout/VPaned.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/CheckMenuItem.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/Combo.chs +5/−5
Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/ImageMenuItem.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/Menu.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/MenuBar.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/MenuShell.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/RadioMenuItem.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/RadioToolButton.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/SeparatorMenuItem.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/SeparatorToolItem.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/TearoffMenuItem.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/ToggleToolButton.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/ToolButton.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs +4/−4
Graphics/UI/Gtk/MenuComboToolbar/ToolItemGroup.chs +3/−3
Graphics/UI/Gtk/MenuComboToolbar/ToolPalette.chs +2/−2
Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs +12/−12
Graphics/UI/Gtk/Misc/Accessible.chs +1/−1
Graphics/UI/Gtk/Misc/Adjustment.chs +2/−2
Graphics/UI/Gtk/Misc/Arrow.chs +3/−3
Graphics/UI/Gtk/Misc/Calendar.chs +4/−4
Graphics/UI/Gtk/Misc/DrawingArea.chs +3/−3
Graphics/UI/Gtk/Misc/EventBox.chs +2/−2
Graphics/UI/Gtk/Misc/HandleBox.chs +3/−3
Graphics/UI/Gtk/Misc/IMContextSimple.chs +1/−1
Graphics/UI/Gtk/Misc/SizeGroup.chs +1/−1
Graphics/UI/Gtk/Misc/Tooltip.chs +1/−1
Graphics/UI/Gtk/Misc/Viewport.chs +3/−3
Graphics/UI/Gtk/ModelView/CellLayout.chs +6/−6
Graphics/UI/Gtk/ModelView/CellRenderer.chs +4/−4
Graphics/UI/Gtk/ModelView/CellRendererAccel.chs +1/−1
Graphics/UI/Gtk/ModelView/CellRendererPixbuf.chs +2/−2
Graphics/UI/Gtk/ModelView/CellRendererProgress.chs +3/−3
Graphics/UI/Gtk/ModelView/CellRendererSpin.chs +1/−1
Graphics/UI/Gtk/ModelView/CellRendererSpinner.chs +2/−2
Graphics/UI/Gtk/ModelView/CellRendererText.chs +13/−13
Graphics/UI/Gtk/ModelView/CellRendererToggle.chs +4/−4
Graphics/UI/Gtk/ModelView/CellView.chs +4/−4
Graphics/UI/Gtk/ModelView/CustomStore.chs +16/−16
Graphics/UI/Gtk/ModelView/ListStore.hs +2/−2
Graphics/UI/Gtk/ModelView/Sequence.hs +434/−434
Graphics/UI/Gtk/ModelView/TreeModel.chs +3/−3
Graphics/UI/Gtk/ModelView/TreeModelFilter.chs +1/−1
Graphics/UI/Gtk/ModelView/TreeModelSort.chs +1/−1
Graphics/UI/Gtk/ModelView/TreeRowReference.chs +1/−1
Graphics/UI/Gtk/ModelView/TreeSelection.chs +3/−3
Graphics/UI/Gtk/ModelView/TreeSortable.chs +3/−3
Graphics/UI/Gtk/ModelView/TreeView.chs +7/−7
Graphics/UI/Gtk/ModelView/TreeViewColumn.chs +6/−6
Graphics/UI/Gtk/ModelView/Types.chs +4/−4
Graphics/UI/Gtk/Multiline/TextBuffer.chs +9/−9
Graphics/UI/Gtk/Multiline/TextIter.chs +7/−7
Graphics/UI/Gtk/Multiline/TextMark.chs +1/−1
Graphics/UI/Gtk/Multiline/TextTag.chs +7/−7
Graphics/UI/Gtk/Multiline/TextTagTable.chs +1/−1
Graphics/UI/Gtk/Multiline/TextView.chs +8/−8
Graphics/UI/Gtk/Multiline/Types.chs +1/−1
Graphics/UI/Gtk/Ornaments/Frame.chs +3/−3
Graphics/UI/Gtk/Ornaments/HSeparator.chs +2/−2
Graphics/UI/Gtk/Ornaments/VSeparator.chs +2/−2
Graphics/UI/Gtk/Printing/PageSetup.chs +1/−1
Graphics/UI/Gtk/Printing/PaperSize.chs +1/−1
Graphics/UI/Gtk/Printing/PrintContext.chs +1/−1
Graphics/UI/Gtk/Printing/PrintOperation.chs +1/−1
Graphics/UI/Gtk/Printing/PrintSettings.chs +1/−1
Graphics/UI/Gtk/Recent/RecentChooser.chs +2/−2
Graphics/UI/Gtk/Recent/RecentChooserMenu.chs +2/−2
Graphics/UI/Gtk/Recent/RecentChooserWidget.chs +2/−2
Graphics/UI/Gtk/Recent/RecentFilter.chs +1/−1
Graphics/UI/Gtk/Recent/RecentInfo.chs +1/−1
Graphics/UI/Gtk/Recent/RecentManager.chs +1/−1
Graphics/UI/Gtk/Scrolling/HScrollbar.chs +2/−2
Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs +3/−3
Graphics/UI/Gtk/Scrolling/VScrollbar.chs +2/−2
Graphics/UI/Gtk/Selectors/ColorButton.chs +3/−3
Graphics/UI/Gtk/Selectors/ColorSelection.chs +2/−2
Graphics/UI/Gtk/Selectors/ColorSelectionDialog.chs +6/−6
Graphics/UI/Gtk/Selectors/FileChooser.chs +15/−15
Graphics/UI/Gtk/Selectors/FileChooserButton.chs +2/−2
Graphics/UI/Gtk/Selectors/FileChooserDialog.chs +2/−2
Graphics/UI/Gtk/Selectors/FileFilter.chs +3/−3
Graphics/UI/Gtk/Selectors/FileSelection.chs +2/−2
Graphics/UI/Gtk/Selectors/FontButton.chs +2/−2
Graphics/UI/Gtk/Selectors/FontSelection.chs +2/−2
Graphics/UI/Gtk/Selectors/FontSelectionDialog.chs +2/−2
Graphics/UI/Gtk/Selectors/HSV.chs +3/−3
Graphics/UI/Gtk/Signals.chs +1/−1
Graphics/UI/Gtk/Special/HRuler.chs +2/−2
Graphics/UI/Gtk/Special/VRuler.chs +2/−2
Graphics/UI/Gtk/Windows/AboutDialog.chs +3/−3
Graphics/UI/Gtk/Windows/Assistant.chs +2/−2
Graphics/UI/Gtk/Windows/Dialog.chs +4/−4
Graphics/UI/Gtk/Windows/Invisible.chs +2/−2
Graphics/UI/Gtk/Windows/MessageDialog.chs +12/−12
Graphics/UI/Gtk/Windows/OffscreenWindow.chs +1/−1
Graphics/UI/Gtk/Windows/Window.chs +6/−6
demo/carsim/CarSim.hs +4/−1
demo/concurrent/Progress.hs +2/−1
demo/concurrent/ProgressThreadedRTS.hs +2/−1
demo/fastdraw/FastDraw.hs +2/−1
demo/unicode/Arabic.hs +2/−1
gtk.cabal +2/−2

Graphics/UI/Gtk.chs view

@@ -24,10 +24,10 @@ -- -- The following modules are not bound: --   DialogMessage : has only one variadic function which cannot be bound.---		     The same functionality can be simulated with Dialog.---   Item :	     The only child of this abstract class is MenuItem. The---		     three signals Item defines are therefore bound in---		     MenuItem.+--                   The same functionality can be simulated with Dialog.+--   Item :          The only child of this abstract class is MenuItem. The+--                   three signals Item defines are therefore bound in+--                   MenuItem. -- -- TODO --@@ -319,7 +319,7 @@ #endif import Graphics.UI.Gtk.Gdk.DrawWindow #if GTK_MAJOR_VERSION < 3-import Graphics.UI.Gtk.Gdk.Region		hiding (makeNewRegion)+import Graphics.UI.Gtk.Gdk.Region               hiding (makeNewRegion) #endif --import Graphics.UI.Gtk.Gdk.GC import Graphics.UI.Gtk.Gdk.EventM@@ -563,10 +563,10 @@ -- non widgets import System.Glib.Signals {- do eport 'on' and 'after'-		(ConnectId, disconnect,-					 signalDisconnect,-					 signalBlock,-					 signalUnblock)+                (ConnectId, disconnect,+                                         signalDisconnect,+                                         signalBlock,+                                         signalUnblock) -} import System.Glib.Attributes import System.Glib.GObject (

Graphics/UI/Gtk/Abstract/Box.chs view

@@ -128,12 +128,12 @@   boxChildPosition,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.General.Enums	(PackType(..), Packing(..),+import Graphics.UI.Gtk.General.Enums    (PackType(..), Packing(..),                                         toPacking, fromPacking) import Graphics.UI.Gtk.Abstract.ContainerChildProperties

Graphics/UI/Gtk/Abstract/Container.chs view

@@ -195,16 +195,16 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}-import System.Glib.GList		(fromGList, withGList)-import Graphics.UI.Gtk.General.Enums	(ResizeMode(..))+import System.Glib.GList                (fromGList, withGList)+import Graphics.UI.Gtk.General.Enums    (ResizeMode(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Abstract/ContainerChildProperties.chs view

@@ -48,8 +48,8 @@ import System.Glib.GType import qualified System.Glib.GTypeConstants as GType import System.Glib.GValueTypes-{#import System.Glib.GValue#}		(GValue(GValue), allocaGValue, valueInit)-import System.Glib.Attributes		(Attr, newAttr)+{#import System.Glib.GValue#}           (GValue(GValue), allocaGValue, valueInit)+import System.Glib.Attributes           (Attr, newAttr)  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Abstract/IMContext.chs view

@@ -65,7 +65,7 @@   imContextDeleteSurrounding',   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM) import Control.Monad.Reader.Class (ask) import Control.Monad.Trans (liftIO) import Data.Maybe (fromMaybe)

Graphics/UI/Gtk/Abstract/Paned.chs view

@@ -118,16 +118,16 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} #ifndef DISABLE_DEPRECATED {#import Graphics.UI.Gtk.Signals#}-import Graphics.UI.Gtk.General.Enums	(ScrollType)+import Graphics.UI.Gtk.General.Enums    (ScrollType) #endif import Graphics.UI.Gtk.Abstract.ContainerChildProperties

Graphics/UI/Gtk/Abstract/Range.chs view

@@ -116,19 +116,19 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}-import Graphics.UI.Gtk.General.Enums	(ScrollType(..))+import Graphics.UI.Gtk.General.Enums    (ScrollType(..)) #if GTK_MAJOR_VERSION < 3-import Graphics.UI.Gtk.General.Enums	(UpdateType(..))+import Graphics.UI.Gtk.General.Enums    (UpdateType(..)) #endif-import Graphics.UI.Gtk.General.Structs	(Rectangle(..))+import Graphics.UI.Gtk.General.Structs  (Rectangle(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Abstract/Scale.chs view

@@ -74,12 +74,12 @@   scaleValuePos,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.General.Enums	(PositionType(..))+import Graphics.UI.Gtk.General.Enums    (PositionType(..))  {# context lib="gtk" prefix="gtk" #}

@@ -470,7 +470,7 @@   afterConfigure,   onDelete,   afterDelete,-  onDestroyEvent,		-- you probably want onDestroy+  onDestroyEvent,               -- you probably want onDestroy   afterDestroyEvent,   onDirectionChanged,   afterDirectionChanged,@@ -535,8 +535,8 @@ #endif   ) where -import Control.Monad	(liftM, unless)-import Data.Maybe	(fromMaybe)+import Control.Monad    (liftM, unless)+import Data.Maybe       (fromMaybe) import Control.Monad.Reader (ask) import Control.Monad.Trans (liftIO) import System.Glib.FFI@@ -550,35 +550,35 @@ import System.Glib.Properties import System.Glib.GType      (GType) import System.Glib.GList      (fromGList)-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) import Graphics.UI.Gtk.General.DNDTypes (Atom (Atom), SelectionTag) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}-import Graphics.UI.Gtk.Gdk.Enums	(EventMask(..)+import Graphics.UI.Gtk.Gdk.Enums        (EventMask(..) #if GTK_MAJOR_VERSION < 3     , ExtensionMode(..) #endif     ) import Graphics.UI.Gtk.Gdk.Keys         (KeyVal) #if GTK_MAJOR_VERSION < 3-{#import Graphics.UI.Gtk.Gdk.Region#}	(Region(..), makeNewRegion)+{#import Graphics.UI.Gtk.Gdk.Region#}   (Region(..), makeNewRegion) {#import Graphics.UI.Gtk.Gdk.Pixmap#} (Bitmap) #endif-import Graphics.UI.Gtk.General.Structs	(Allocation, Rectangle(..)-					,Requisition(..), Color, IconSize(..)+import Graphics.UI.Gtk.General.Structs  (Allocation, Rectangle(..)+                                        ,Requisition(..), Color, IconSize(..)                                         ,Point #if !GTK_CHECK_VERSION(2,18,0)                                         ,widgetGetState #endif #if GTK_MAJOR_VERSION < 3                                         ,widgetGetSavedState-					,widgetGetDrawWindow, widgetGetSize+                                        ,widgetGetDrawWindow, widgetGetSize #endif-					)+                                        ) #ifndef DISABLE_DEPRECATED-import Graphics.UI.Gtk.Gdk.Events	(Event(..), marshalEvent, marshExposeRect)+import Graphics.UI.Gtk.Gdk.Events       (Event(..), marshalEvent, marshExposeRect) #endif-import Graphics.UI.Gtk.Gdk.EventM	(EventM,+import Graphics.UI.Gtk.Gdk.EventM       (EventM,   EventM,   EAny,   EKey,@@ -597,18 +597,18 @@   EGrabBroken, #endif   )-import Graphics.UI.Gtk.General.Enums	(StateType(..), TextDirection(..),-					 AccelFlags(..), DirectionType(..), Modifier+import Graphics.UI.Gtk.General.Enums    (StateType(..), TextDirection(..),+                                         AccelFlags(..), DirectionType(..), Modifier #if GTK_CHECK_VERSION(3,0,0)                                         ,StateFlags(..), Align(..) #endif #if GTK_CHECK_VERSION(3,4,0)                                         ,ModifierIntent(..) #endif-					)+                                        ) {#import Graphics.Rendering.Pango.Types#}-{#import Graphics.Rendering.Pango.BasicTypes#}	(FontDescription(FontDescription),-					 PangoLayout(PangoLayout), makeNewPangoString )+{#import Graphics.Rendering.Pango.BasicTypes#}  (FontDescription(FontDescription),+                                         PangoLayout(PangoLayout), makeNewPangoString ) import Graphics.UI.Gtk.General.StockItems (StockId) import Data.IORef ( newIORef ) import Control.Monad.Reader ( runReaderT )@@ -1936,7 +1936,7 @@ -- > l <- widgetCreateLayout w "My Text." -- > let update = do -- >                layoutContextChanged l--- > 		    -- update the Drawables which show this layout+-- >                -- update the Drawables which show this layout -- > w `onDirectionChanged` update -- > w `onStyleChanged` update --@@ -4199,8 +4199,8 @@ -- * The widget received a destroy event from the window manager. -- onDestroyEvent, afterDestroyEvent :: WidgetClass w =>-				     w -> (Event -> IO Bool) ->-				     IO (ConnectId w)+                                     w -> (Event -> IO Bool) ->+                                     IO (ConnectId w) onDestroyEvent = event "destroy_event" [] False afterDestroyEvent = event "destroy_event" [] True

Graphics/UI/Gtk/ActionMenuToolbar/Action.chs view

@@ -146,14 +146,14 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.GList import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} import Graphics.UI.Gtk.General.StockItems

Graphics/UI/Gtk/ActionMenuToolbar/ActionGroup.chs view

@@ -106,7 +106,7 @@ #endif   ) where -import Control.Monad	(liftM, foldM, when)+import Control.Monad    (liftM, foldM, when)  import System.Glib.FFI import System.Glib.UTFString@@ -331,18 +331,18 @@                        -- initially, or -1 if no action should be activated  -> (RadioAction -> IO ()) -- ^ @onChange@ - the callback for the changed signal  -> IO ()-actionGroupAddRadioActions self entries value onChange = do+actionGroupAddRadioActions self entries initialValue onChange = do   group <- foldM-    (\group (n, RadioActionEntry name label stockId+    (\group (RadioActionEntry name label stockId                accelerator tooltip value) -> do     action <- radioActionNew name label tooltip stockId value     case group of       Nothing -> return ()       Just group -> radioActionSetGroup action group-    when (n == value) (toggleActionSetActive action True)+    when (initialValue == value) (toggleActionSetActive action True)     actionGroupAddActionWithAccel self action accelerator     return (Just action))-    Nothing (zip [0..] entries)+    Nothing entries   case group of       Nothing -> return ()       Just group -> do

Graphics/UI/Gtk/ActionMenuToolbar/RadioAction.chs view

@@ -81,7 +81,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString

Graphics/UI/Gtk/ActionMenuToolbar/RecentAction.chs view

@@ -64,7 +64,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes

Graphics/UI/Gtk/ActionMenuToolbar/ToggleAction.chs view

@@ -77,7 +77,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString

Graphics/UI/Gtk/ActionMenuToolbar/UIManager.chs view

@@ -253,16 +253,16 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import System.Glib.Flags		(Flags, fromFlags)+import System.Glib.Flags                (Flags, fromFlags) import System.Glib.UTFString import System.Glib.GList import System.Glib.GError import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Buttons/Button.chs view

@@ -137,16 +137,16 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}-import Graphics.UI.Gtk.General.Enums	(ReliefStyle(..), PositionType(..))+import Graphics.UI.Gtk.General.Enums    (ReliefStyle(..), PositionType(..)) import Graphics.UI.Gtk.General.StockItems  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Buttons/CheckButton.chs view

@@ -60,11 +60,11 @@   checkButtonNewWithMnemonic,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Buttons/LinkButton.chs view

@@ -84,13 +84,13 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Buttons/RadioButton.chs view

@@ -140,13 +140,13 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.GList import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Buttons/ScaleButton.chs view

@@ -81,14 +81,14 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)-import Graphics.UI.Gtk.General.Structs	(IconSize(..))+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject)+import Graphics.UI.Gtk.General.Structs  (IconSize(..)) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Buttons/ToggleButton.chs view

@@ -92,13 +92,13 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Buttons/VolumeButton.chs view

@@ -61,10 +61,10 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Display/AccelLabel.chs view

@@ -83,12 +83,12 @@   accelLabelAccelWidget,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Display/Image.chs view

@@ -141,16 +141,16 @@   imageStorageType,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} import Graphics.UI.Gtk.General.StockItems-import Graphics.UI.Gtk.General.Structs	(IconSize(..))+import Graphics.UI.Gtk.General.Structs  (IconSize(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Display/InfoBar.chs view

@@ -94,13 +94,13 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-{#import Graphics.UI.Gtk.Abstract.Object#}	(makeNewObject)+{#import Graphics.UI.Gtk.Abstract.Object#}      (makeNewObject) {#import Graphics.UI.Gtk.Windows.MessageDialog#} (MessageType) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Display/ProgressBar.chs view

@@ -100,19 +100,19 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} #if GTK_MAJOR_VERSION < 3-import Graphics.UI.Gtk.General.Enums	(ProgressBarOrientation(..))+import Graphics.UI.Gtk.General.Enums    (ProgressBarOrientation(..)) #endif #if GTK_CHECK_VERSION(2,6,0)-import Graphics.Rendering.Pango.Enums	(EllipsizeMode(..))+import Graphics.Rendering.Pango.Enums   (EllipsizeMode(..)) #endif  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Display/Spinner.chs view

@@ -50,12 +50,12 @@ #endif ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Display/StatusIcon.chs view

@@ -159,7 +159,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString

Graphics/UI/Gtk/Display/Statusbar.chs view

@@ -112,14 +112,14 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString #if GTK_MAJOR_VERSION < 3 import System.Glib.Attributes #endif-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Embedding/Embedding.hsc view

@@ -42,7 +42,7 @@ socketHasPlug :: SocketClass s => s -> IO Bool socketHasPlug socket = do   plugPtr <- withForeignPtr (unSocket (toSocket socket))-	     #{peek GtkSocket, plug_window}+             #{peek GtkSocket, plug_window}   return (plugPtr/=nullPtr)  #endif

Graphics/UI/Gtk/Embedding/Plug.chs view

@@ -80,13 +80,13 @@  #if (defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0))) || defined(GDK_WINDOWING_X11) -import Control.Monad	(liftM)-import Data.Maybe	(fromMaybe)+import Control.Monad    (liftM)+import Data.Maybe       (fromMaybe)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Embedding.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Embedding/Socket.chs view

@@ -117,13 +117,13 @@  #if (defined(HAVE_PLUG_AND_SOCKET) && (!defined(WIN32) || GTK_CHECK_VERSION(2,8,0))) || defined(GDK_WINDOWING_X11) -import Control.Monad	(liftM)+import Control.Monad    (liftM) import Data.Maybe (isJust)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object		(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object          (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Embedding.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Entry/Entry.chs view

@@ -131,6 +131,7 @@   entryMoveCursor,   entryPopulatePopup,   entryToggleOverwirte,+  entryToggleOverwrite, #if GTK_CHECK_VERSION(2,20,0)   entryPreeditChanged, #endif@@ -154,21 +155,21 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM) import Control.Monad.Reader (runReaderT)-import Data.Char	(ord, chr)+import Data.Char        (ord, chr)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) import Graphics.UI.Gtk.General.Enums (DeleteType (..), MovementStep (..) #if GTK_CHECK_VERSION(2,16,0)   , EntryIconPosition (..) #endif   )-import Graphics.UI.Gtk.Gdk.EventM	(EventM, EButton, EKey)+import Graphics.UI.Gtk.Gdk.EventM       (EventM, EButton, EKey) import Control.Monad.Reader             ( ask ) import Control.Monad.Trans              ( liftIO ) #if GTK_CHECK_VERSION (2,18,0)@@ -795,12 +796,16 @@   connect_ENUM_PTR__NONE "icon-press" after obj (runReaderT . f) #endif +{-# DEPRECATED entryToggleOverwirte "Use entryToggleOverwrite" #-}+entryToggleOverwirte :: EntryClass ec => Signal ec (IO ())+entryToggleOverwirte = entryToggleOverwrite+ -- | The 'entryToggleOverwrite' signal is a keybinding signal which gets emitted to toggle the overwrite mode -- of the entry.--- -- The default bindings for this signal is Insert.-entryToggleOverwirte :: EntryClass ec => Signal ec (IO ())-entryToggleOverwirte = Signal (connect_NONE__NONE "toggle-overwrite")+--+entryToggleOverwrite :: EntryClass ec => Signal ec (IO ())+entryToggleOverwrite = Signal (connect_NONE__NONE "toggle-overwrite")  #ifndef DISABLE_DEPRECATED -- | Emitted when the user presses return within

Graphics/UI/Gtk/Entry/EntryBuffer.chs view

@@ -79,7 +79,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM) import Data.Maybe       (fromJust)  import System.Glib.FFI

Graphics/UI/Gtk/Entry/EntryCompletion.chs view

@@ -136,7 +136,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString

Graphics/UI/Gtk/Entry/HScale.chs view

@@ -56,10 +56,10 @@   hScaleNewWithRange,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Entry/SpinButton.chs view

@@ -102,16 +102,16 @@   afterValueSpinned   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}-import Graphics.UI.Gtk.General.Structs	(inputError)-import Graphics.UI.Gtk.General.Enums	(SpinButtonUpdatePolicy(..), SpinType(..))+import Graphics.UI.Gtk.General.Structs  (inputError)+import Graphics.UI.Gtk.General.Enums    (SpinButtonUpdatePolicy(..), SpinType(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Entry/VScale.chs view

@@ -56,10 +56,10 @@   vScaleNewWithRange,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Gdk/Display.chs view

@@ -112,7 +112,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString

Graphics/UI/Gtk/Gdk/Drawable.chs view

@@ -70,18 +70,18 @@ ) where  #if GTK_MAJOR_VERSION < 3-import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.General.Structs	(Point, drawableGetID)+import Graphics.UI.Gtk.General.Structs  (Point, drawableGetID) import Graphics.Rendering.Pango.Structs {#import Graphics.Rendering.Pango.Types#} {#import Graphics.Rendering.Pango.BasicTypes#} {#import Graphics.UI.Gtk.Types#} #if GTK_MAJOR_VERSION < 3-{#import Graphics.UI.Gtk.Gdk.Region#}	(Region, makeNewRegion)+{#import Graphics.UI.Gtk.Gdk.Region#}   (Region, makeNewRegion) #endif-import Graphics.UI.Gtk.Gdk.Enums	(Dither(..))+import Graphics.UI.Gtk.Gdk.Enums        (Dither(..))  {# context lib="gtk" prefix="gdk" #} @@ -94,7 +94,7 @@ -- drawableGetDepth :: DrawableClass d => d -> IO Int drawableGetDepth d = liftM fromIntegral $-		     {#call unsafe drawable_get_depth#} (toDrawable d)+                     {#call unsafe drawable_get_depth#} (toDrawable d)  -- | Retrieve the size of the 'Drawable'. --@@ -193,8 +193,8 @@ -- * Since 2.2. -- drawPixbuf :: DrawableClass d => d -> GC -> Pixbuf -> Int -> Int ->-				 Int -> Int -> Int -> Int -> Dither ->-				 Int -> Int -> IO ()+                                 Int -> Int -> Int -> Int -> Dither ->+                                 Int -> Int -> IO () drawPixbuf d gc pb srcX srcY destX destY srcWidth srcHeight dither   xDither yDither = {#call unsafe draw_pixbuf#} (toDrawable d)     gc pb (fromIntegral srcX) (fromIntegral srcY) (fromIntegral destX)@@ -251,7 +251,7 @@ --   is measured similarly, but relative to @aStart@. -- drawArc :: DrawableClass d => d -> GC -> Bool -> Int -> Int ->-				 Int -> Int -> Int -> Int -> IO ()+                                 Int -> Int -> Int -> Int -> IO () drawArc d gc filled x y width height aStart aEnd =   {#call unsafe draw_arc#} (toDrawable d) (toGC gc) (fromBool filled)   (fromIntegral x) (fromIntegral y) (fromIntegral width) (fromIntegral height)@@ -293,7 +293,7 @@ --   the @y@ coordinate specifies the base line. -- drawLayoutLine :: DrawableClass d => d -> GC -> Int -> Int -> LayoutLine ->-				     IO ()+                                     IO () drawLayoutLine d gc x y (LayoutLine _ ll) =   {#call unsafe draw_layout_line#} (toDrawable d) (toGC gc)     (fromIntegral x) (fromIntegral y) ll@@ -308,7 +308,7 @@ --   the graphics context. -- drawLayoutLineWithColors :: DrawableClass d => d -> GC -> Int -> Int ->-			    LayoutLine -> Maybe Color -> Maybe Color -> IO ()+                            LayoutLine -> Maybe Color -> Maybe Color -> IO () drawLayoutLineWithColors d gc x y (LayoutLine _ ll) foreground background = let     withMB :: Storable a => Maybe a -> (Ptr a -> IO b) -> IO b     withMB Nothing f = f nullPtr@@ -339,7 +339,7 @@ --   the graphics context. -- drawLayoutWithColors :: DrawableClass d => d -> GC -> Int -> Int ->-			PangoLayout -> Maybe Color -> Maybe Color -> IO ()+                        PangoLayout -> Maybe Color -> Maybe Color -> IO () drawLayoutWithColors d gc x y (PangoLayout _ pl) foreground background = let     withMB :: Storable a => Maybe a -> (Ptr a -> IO b) -> IO b     withMB Nothing f = f nullPtr

Graphics/UI/Gtk/Gdk/Enums.chs view

@@ -58,7 +58,7 @@ #endif   ) where -import System.Glib.Flags	(Flags)+import System.Glib.Flags        (Flags)  {#context lib="gdk" prefix ="gdk"#} @@ -247,8 +247,8 @@ -- | visibility of a window -- {#enum VisibilityState {underscoreToCase,-			VISIBILITY_PARTIAL as VisibilityPartialObscured}-			 deriving(Eq,Show) #}+                        VISIBILITY_PARTIAL as VisibilityPartialObscured}+                         deriving(Eq,Show) #}  -- | The state a @DrawWindow@ is in. --

Graphics/UI/Gtk/Gdk/EventM.hsc view

@@ -174,7 +174,7 @@ #endif  -- * Auxilliary Definitions-  Modifier(..),		-- a mask of control keys+  Modifier(..),         -- a mask of control keys   TimeStamp,   currentTime,   tryEvent,@@ -186,18 +186,18 @@ import System.Glib.UTFString import System.Glib.Flags import System.Glib.GObject ( makeNewGObject )-import Graphics.UI.Gtk.Gdk.Keys		(KeyVal, KeyCode, keyName)+import Graphics.UI.Gtk.Gdk.Keys         (KeyVal, KeyCode, keyName) #if GTK_MAJOR_VERSION < 3 import Graphics.UI.Gtk.Gdk.Region       (Region, makeNewRegion) #endif-import Graphics.UI.Gtk.Gdk.Enums	(Modifier(..), VisibilityState(..),+import Graphics.UI.Gtk.Gdk.Enums        (Modifier(..), VisibilityState(..),   CrossingMode(..), NotifyType(..), WindowState(..), ScrollDirection(..), #if GTK_CHECK_VERSION(2,6,0)   OwnerChange(..) #endif   )-import Graphics.UI.Gtk.General.Enums	(MouseButton(..), Click(..))-import Graphics.UI.Gtk.General.Structs	(Rectangle(..))+import Graphics.UI.Gtk.General.Enums    (MouseButton(..), Click(..))+import Graphics.UI.Gtk.General.Structs  (Rectangle(..)) import Graphics.UI.Gtk.General.DNDTypes (Atom(..), SelectionTag) import Graphics.UI.Gtk.Types ( DrawWindow, mkDrawWindow ) @@ -397,23 +397,23 @@     (ty :: #{gtk2hs_type GdkEventType}) <- peek (castPtr ptr)     if ty `elem` [ #{const GDK_KEY_PRESS},                    #{const GDK_KEY_RELEASE}] then do-        (modif ::#gtk2hs_type guint)	<- #{peek GdkEventKey, state} ptr+        (modif ::#gtk2hs_type guint)    <- #{peek GdkEventKey, state} ptr         return (toFlags (fromIntegral (modif .&. mask)))       else if ty `elem` [ #{const GDK_BUTTON_PRESS},                    #{const GDK_2BUTTON_PRESS},                    #{const GDK_3BUTTON_PRESS},                    #{const GDK_BUTTON_RELEASE}] then do-        (modif ::#gtk2hs_type guint)	<- #{peek GdkEventButton, state} ptr+        (modif ::#gtk2hs_type guint)    <- #{peek GdkEventButton, state} ptr         return (toFlags (fromIntegral (modif .&. mask)))       else if ty `elem` [ #{const GDK_SCROLL} ] then do-        (modif ::#gtk2hs_type guint)	<- #{peek GdkEventScroll, state} ptr+        (modif ::#gtk2hs_type guint)    <- #{peek GdkEventScroll, state} ptr         return (toFlags (fromIntegral (modif .&. mask)))       else if ty `elem` [ #{const GDK_MOTION_NOTIFY} ] then do-        (modif ::#gtk2hs_type guint)	<- #{peek GdkEventMotion, state} ptr+        (modif ::#gtk2hs_type guint)    <- #{peek GdkEventMotion, state} ptr         return (toFlags (fromIntegral (modif .&. mask)))       else if ty `elem` [ #{const GDK_ENTER_NOTIFY},                           #{const GDK_LEAVE_NOTIFY}] then do-        (modif ::#gtk2hs_type guint)	<- #{peek GdkEventCrossing, state} ptr+        (modif ::#gtk2hs_type guint)    <- #{peek GdkEventCrossing, state} ptr         return (toFlags (fromIntegral (modif .&. mask)))       else error ("eventModifiers: none for event type "++show ty) @@ -562,7 +562,7 @@ -- Removed in Gtk3. eventRegion :: EventM EExpose Region eventRegion = ask >>= \ptr -> liftIO $ do-  (reg_   :: Ptr Region)	<- #{peek GdkEventExpose, region} ptr+  (reg_   :: Ptr Region)        <- #{peek GdkEventExpose, region} ptr   reg_ <- gdk_region_copy reg_   makeNewRegion reg_ @@ -598,15 +598,15 @@ -- | Get the @(x,y)@ position of the window within the parent window. eventPosition :: EventM EConfigure (Int,Int) eventPosition = ask >>= \ptr -> liftIO $ do-  (x :: #{gtk2hs_type gint})	<- #{peek GdkEventConfigure, x} ptr-  (y :: #{gtk2hs_type gint})	<- #{peek GdkEventConfigure, y} ptr+  (x :: #{gtk2hs_type gint})    <- #{peek GdkEventConfigure, x} ptr+  (y :: #{gtk2hs_type gint})    <- #{peek GdkEventConfigure, y} ptr   return (fromIntegral x, fromIntegral y)  -- | Get the new size of the window as @(width,height)@. eventSize :: EventM EConfigure (Int,Int) eventSize = ask >>= \ptr -> liftIO $ do-  (x :: #{gtk2hs_type gint})	<- #{peek GdkEventConfigure, width} ptr-  (y :: #{gtk2hs_type gint})	<- #{peek GdkEventConfigure, height} ptr+  (x :: #{gtk2hs_type gint})    <- #{peek GdkEventConfigure, width} ptr+  (y :: #{gtk2hs_type gint})    <- #{peek GdkEventConfigure, height} ptr   return (fromIntegral x, fromIntegral y)  eventProperty :: EventM EProperty Atom

Graphics/UI/Gtk/Gdk/Events.hsc view

@@ -31,12 +31,12 @@ -- favor of 'Graphics.UI.Gtk.Gdk.EventM' and not exported by Gtk.hs. -- module Graphics.UI.Gtk.Gdk.Events (-  Modifier(..),		-- a mask of control keys+  Modifier(..),         -- a mask of control keys   TimeStamp,   currentTime,    -- | Deprecated way of conveying event information.-  Event(..),		-- information in event callbacks from Gdk+  Event(..),            -- information in event callbacks from Gdk   EventButton,   EventScroll,   EventMotion,@@ -54,7 +54,7 @@   marshExposeRect,    -- selector functions-  marshalEvent,		-- convert a pointer to an event data structure+  marshalEvent,         -- convert a pointer to an event data structure   -- used data structures   VisibilityState(..),   CrossingMode(..),@@ -70,18 +70,18 @@ import System.Glib.FFI import System.Glib.UTFString import System.Glib.Flags-import Graphics.UI.Gtk.Gdk.Keys		(KeyVal, keyvalToChar, keyvalName)+import Graphics.UI.Gtk.Gdk.Keys         (KeyVal, keyvalToChar, keyvalName) #if GTK_MAJOR_VERSION < 3 import Graphics.UI.Gtk.Gdk.Region       (Region, makeNewRegion) #endif-import Graphics.UI.Gtk.Gdk.Enums	(Modifier(..),+import Graphics.UI.Gtk.Gdk.Enums        (Modifier(..),                                          VisibilityState(..),-					 CrossingMode(..),-					 NotifyType(..),-					 WindowState(..),-					 ScrollDirection(..))-import Graphics.UI.Gtk.General.Enums	(MouseButton(..), Click(..))-import Graphics.UI.Gtk.General.Structs	(Rectangle(..))+                                         CrossingMode(..),+                                         NotifyType(..),+                                         WindowState(..),+                                         ScrollDirection(..))+import Graphics.UI.Gtk.General.Enums    (MouseButton(..), Click(..))+import Graphics.UI.Gtk.General.Structs  (Rectangle(..))  -- | The time (in milliseconds) when an event happened. This is used mostly -- for ordering events and responses to events.@@ -192,11 +192,11 @@   --   'Graphics.UI.Gtk.Abstract.Widget.widgetQueueDrawArea'.   --   | Expose {-    eventSent	:: Bool,+    eventSent   :: Bool,     -- | A bounding box denoting what needs to be updated. For a more     -- detailed information on the area that needs redrawing, use the     -- next field.-    eventArea	:: Rectangle,+    eventArea   :: Rectangle, #if GTK_MAJOR_VERSION < 3     -- | A set of horizontal stripes that denote the invalid area.     eventRegion      :: Region,@@ -206,17 +206,17 @@     --   one. The only use for this is \"exposure compression\", i.e.     --   handling all contiguous 'Expose' events in one go, though Gdk     --   performs some exposure compression so this is not normally needed.-    eventCount	:: Int }+    eventCount  :: Int }   -- | Mouse motion.   --   -- * Captures the movement of the mouse cursor while it is within the area   --   of the widget.   --   | Motion {-    eventSent	:: Bool,-    eventTime	:: TimeStamp,-    eventX,eventY	:: Double,-    eventModifier 	:: [Modifier],+    eventSent   :: Bool,+    eventTime   :: TimeStamp,+    eventX,eventY       :: Double,+    eventModifier       :: [Modifier],     -- | Indicate if this event is only a hint of the motion.     --     -- * If the 'Graphics.UI.Gtk.Abstract.Widget.PointerMotionHintMask'@@ -225,32 +225,32 @@     --  'Graphics.UI.Gtk.Gdk.DrawWindow.drawWindowGetPointer'     --   is called. In this case 'eventIsHint' is set to @True@.     ---    eventIsHint	:: Bool,+    eventIsHint :: Bool,     eventXRoot,-    eventYRoot	:: Double }+    eventYRoot  :: Double }   -- | A mouse button was pressed or released.   --   -- * This event is triggered if the mouse button was pressed or released   --   while the mouse cursor was within the region of the widget.   --   | Button {-    eventSent	:: Bool,+    eventSent   :: Bool,     -- | The kind of button press, see 'Click'. Note that double clicks will     --   trigger this event with 'eventClick' set to 'SingleClick',     --   'ReleaseClick',     --   'SingleClick', 'DoubleClick', 'ReleaseClick'. Triple clicks will     --   produce this sequence followed by 'SingleClick', 'DoubleClick',     --   'TripleClick', 'ReleaseClick'.-    eventClick	:: Click,+    eventClick  :: Click,     -- | The time of the event in milliseconds.-    eventTime	:: TimeStamp,-    eventX,eventY	:: Double,-    eventModifier	:: [Modifier],+    eventTime   :: TimeStamp,+    eventX,eventY       :: Double,+    eventModifier       :: [Modifier],     -- | The button that was pressed.-    eventButton	:: MouseButton,+    eventButton :: MouseButton,     -- | The coordinates of the click relative to the screen origin.     eventXRoot,-    eventYRoot	:: Double }+    eventYRoot  :: Double }   -- | A key was pressed while the widget had the input focus.   --   -- * If the widget has the current input focus (see@@ -267,10 +267,10 @@     --   to connect the same handler to     --  'Graphics.UI.Gtk.Abstract.Widget.onKeyPress' and     --  'Graphics.UI.Gtk.Abstract.Widget.onKeyRelease'.-    eventRelease	:: Bool,-    eventSent	:: Bool,-    eventTime	:: TimeStamp,-    eventModifier	:: [Modifier],+    eventRelease        :: Bool,+    eventSent   :: Bool,+    eventTime   :: TimeStamp,+    eventModifier       :: [Modifier],     -- | This flag is @True@ if Caps Lock is on while this key was pressed.     eventWithCapsLock   :: Bool,     -- | This flag is @True@ if Number Lock is on while this key was pressed.@@ -303,11 +303,11 @@   --   some GUI elements like buttons on a toolbar change their appearance.   --   | Crossing {-    eventSent	:: Bool,-    eventTime	:: TimeStamp,-    eventX,eventY	:: Double,+    eventSent   :: Bool,+    eventTime   :: TimeStamp,+    eventX,eventY       :: Double,     eventXRoot,-    eventYRoot	:: Double,+    eventYRoot  :: Double,     -- | This flag is false if the widget was entered, it is true when the     --   widget the mouse cursor left the widget.     eventLeaves :: Bool,@@ -316,21 +316,21 @@     -- * The mouse cursor might enter this widget because it grabs the mouse     --   cursor for e.g. a modal dialog box.     ---    eventCrossingMode	:: CrossingMode,+    eventCrossingMode   :: CrossingMode,     -- | Information on from what level of the widget hierarchy the mouse     --   cursor came.     --     -- * See 'NotifyType'.     ---    eventNotifyType	:: NotifyType,-    eventModifier	:: [Modifier]}+    eventNotifyType     :: NotifyType,+    eventModifier       :: [Modifier]}   -- | Gaining or loosing input focus.   --   | Focus {-    eventSent	:: Bool,+    eventSent   :: Bool,     -- | This flag is @True@ if the widget receives the focus and @False@ if     -- it just lost the input focus.-    eventInFocus	:: Bool}+    eventInFocus        :: Bool}   -- | The widget\'s size has changed.   --   -- * In response to this event the application can allocate resources that@@ -338,18 +338,18 @@   --   is shown the first time and on every resize.   --   | Configure {-    eventSent	:: Bool,+    eventSent   :: Bool,     -- | Position within the parent window.-    eventXParent	:: Int,+    eventXParent        :: Int,     -- | Position within the parent window.-    eventYParent	:: Int,-    eventWidth	:: Int,-    eventHeight	:: Int}+    eventYParent        :: Int,+    eventWidth  :: Int,+    eventHeight :: Int}   -- | Change of visibility of a widget.   | Visibility {-    eventSent	:: Bool,+    eventSent   :: Bool,     -- | Denote what portions of the widget is visible.-    eventVisible	:: VisibilityState }+    eventVisible        :: VisibilityState }   -- | Wheel movement of the mouse.   --   -- * This action denotes that the content of the widget should be scrolled.@@ -364,23 +364,23 @@   --   surround this widget which in turn tell this widget to update.   --   | Scroll {-    eventSent	:: Bool,-    eventTime	:: TimeStamp,-    eventX,eventY	:: Double,-    eventDirection	:: ScrollDirection,+    eventSent   :: Bool,+    eventTime   :: TimeStamp,+    eventX,eventY       :: Double,+    eventDirection      :: ScrollDirection,     eventXRoot,-    eventYRoot	:: Double}+    eventYRoot  :: Double}   -- | Indicate how the appearance of this window has changed.   | WindowState {-    eventSent	:: Bool,+    eventSent   :: Bool,     -- | The mask indicates which flags have changed.-    eventWindowMask	:: [WindowState],+    eventWindowMask     :: [WindowState],     -- | The state indicates the current state of the window.-    eventWindowState	:: [WindowState]}+    eventWindowState    :: [WindowState]}   -- | The state of the pen of a graphics tablet pen or touchscreen device.   | Proximity {-    eventSent	:: Bool,-    eventTime	:: TimeStamp,+    eventSent   :: Bool,+    eventTime   :: TimeStamp,     -- | Whether the stylus has moved in or out of contact with the tablet.     eventInContact     :: Bool   } deriving Show@@ -391,47 +391,47 @@   (case eType of     #{const GDK_DELETE}         -> marshAny     #{const GDK_DESTROY}        -> marshAny-    #{const GDK_EXPOSE}		-> marshExpose-    #{const GDK_MOTION_NOTIFY}	-> marshMotion-    #{const GDK_BUTTON_PRESS}	-> marshButton SingleClick+    #{const GDK_EXPOSE}         -> marshExpose+    #{const GDK_MOTION_NOTIFY}  -> marshMotion+    #{const GDK_BUTTON_PRESS}   -> marshButton SingleClick     #{const GDK_2BUTTON_PRESS}  -> marshButton DoubleClick-    #{const GDK_3BUTTON_PRESS}	-> marshButton TripleClick-    #{const GDK_BUTTON_RELEASE}	-> marshButton ReleaseClick-    #{const GDK_KEY_PRESS}	-> marshKey False-    #{const GDK_KEY_RELEASE}	-> marshKey True-    #{const GDK_ENTER_NOTIFY}	-> marshCrossing False-    #{const GDK_LEAVE_NOTIFY}	-> marshCrossing True-    #{const GDK_FOCUS_CHANGE}	-> marshFocus-    #{const GDK_CONFIGURE}	-> marshConfigure+    #{const GDK_3BUTTON_PRESS}  -> marshButton TripleClick+    #{const GDK_BUTTON_RELEASE} -> marshButton ReleaseClick+    #{const GDK_KEY_PRESS}      -> marshKey False+    #{const GDK_KEY_RELEASE}    -> marshKey True+    #{const GDK_ENTER_NOTIFY}   -> marshCrossing False+    #{const GDK_LEAVE_NOTIFY}   -> marshCrossing True+    #{const GDK_FOCUS_CHANGE}   -> marshFocus+    #{const GDK_CONFIGURE}      -> marshConfigure     #{const GDK_MAP}            -> marshAny     #{const GDK_UNMAP}          -> marshAny --    #{const GDK_PROPERTY_NOTIFY}-> marshProperty     #{const GDK_PROXIMITY_IN}   -> marshProximity True-    #{const GDK_PROXIMITY_OUT}	-> marshProximity False+    #{const GDK_PROXIMITY_OUT}  -> marshProximity False     #{const GDK_VISIBILITY_NOTIFY}-> marshVisibility-    #{const GDK_SCROLL}		-> marshScroll-    #{const GDK_WINDOW_STATE}	-> marshWindowState-    code			-> \_ -> fail $+    #{const GDK_SCROLL}         -> marshScroll+    #{const GDK_WINDOW_STATE}   -> marshWindowState+    code                        -> \_ -> fail $       "marshalEvent: unhandled event type " ++ show code ++       "\nplease report this as a bug to gtk2hs-devel@lists.sourceforge.net"     ) ptr  marshAny ptr = do-  (sent   ::#gtk2hs_type gint8)	<- #{peek GdkEventAny, send_event} ptr+  (sent   ::#gtk2hs_type gint8) <- #{peek GdkEventAny, send_event} ptr   return Event {     eventSent = toBool sent   }  marshExpose ptr = do   (#{const GDK_EXPOSE}::#gtk2hs_type GdkEventType) <- #{peek GdkEventAny,type} ptr-  (sent_   ::#gtk2hs_type gint8)	<- #{peek GdkEventExpose, send_event} ptr-  (area_   ::Rectangle)		<- #{peek GdkEventExpose, area} ptr+  (sent_   ::#gtk2hs_type gint8)        <- #{peek GdkEventExpose, send_event} ptr+  (area_   ::Rectangle)         <- #{peek GdkEventExpose, area} ptr #if GTK_MAJOR_VERSION < 3-  (reg_   :: Ptr Region)	<- #{peek GdkEventExpose, region} ptr+  (reg_   :: Ptr Region)        <- #{peek GdkEventExpose, region} ptr   reg_ <- gdk_region_copy reg_   region_ <- makeNewRegion reg_ #endif-  (count_  ::#gtk2hs_type gint)	<- #{peek GdkEventExpose, count} ptr+  (count_  ::#gtk2hs_type gint) <- #{peek GdkEventExpose, count} ptr   return $ Expose {     eventSent   = toBool sent_,     eventArea   = area_,@@ -448,43 +448,43 @@ marshExposeRect :: Ptr Event -> IO Rectangle marshExposeRect ptr = do   (#{const GDK_EXPOSE}::#gtk2hs_type GdkEventType) <- #{peek GdkEventAny,type} ptr-  (area_   ::Rectangle)		<- #{peek GdkEventExpose, area} ptr+  (area_   ::Rectangle)         <- #{peek GdkEventExpose, area} ptr   return area_  marshMotion ptr = do-  (sent_   ::#gtk2hs_type gint8)	<- #{peek GdkEventMotion, send_event} ptr-  (time_   ::#gtk2hs_type guint32)	<- #{peek GdkEventMotion, time} ptr-  (x_	   ::#gtk2hs_type gdouble)	<- #{peek GdkEventMotion, x} ptr-  (y_	   ::#gtk2hs_type gdouble)	<- #{peek GdkEventMotion, y} ptr-  (modif_  ::#gtk2hs_type guint)	<- #{peek GdkEventMotion, state} ptr-  (isHint_ ::#gtk2hs_type gint16)	<- #{peek GdkEventMotion, is_hint} ptr-  (xRoot_  ::#gtk2hs_type gdouble)	<- #{peek GdkEventMotion, x_root} ptr-  (yRoot_  ::#gtk2hs_type gdouble)	<- #{peek GdkEventMotion, y_root} ptr+  (sent_   ::#gtk2hs_type gint8)        <- #{peek GdkEventMotion, send_event} ptr+  (time_   ::#gtk2hs_type guint32)      <- #{peek GdkEventMotion, time} ptr+  (x_      ::#gtk2hs_type gdouble)      <- #{peek GdkEventMotion, x} ptr+  (y_      ::#gtk2hs_type gdouble)      <- #{peek GdkEventMotion, y} ptr+  (modif_  ::#gtk2hs_type guint)        <- #{peek GdkEventMotion, state} ptr+  (isHint_ ::#gtk2hs_type gint16)       <- #{peek GdkEventMotion, is_hint} ptr+  (xRoot_  ::#gtk2hs_type gdouble)      <- #{peek GdkEventMotion, x_root} ptr+  (yRoot_  ::#gtk2hs_type gdouble)      <- #{peek GdkEventMotion, y_root} ptr   return $ Motion {     eventSent   = toBool sent_,     eventTime   = fromIntegral time_,-    eventX	   = realToFrac x_,-    eventY	   = realToFrac y_,+    eventX         = realToFrac x_,+    eventY         = realToFrac y_,     eventModifier  = (toFlags . fromIntegral) modif_,     eventIsHint = toBool isHint_,     eventXRoot  = realToFrac xRoot_,     eventYRoot  = realToFrac yRoot_}  marshButton but ptr = do-  (sent_   ::#gtk2hs_type gint8)	<- #{peek GdkEventButton, send_event} ptr-  (time_   ::#gtk2hs_type guint32)	<- #{peek GdkEventButton, time} ptr-  (x_	   ::#gtk2hs_type gdouble)	<- #{peek GdkEventButton, x} ptr-  (y_	   ::#gtk2hs_type gdouble)	<- #{peek GdkEventButton, y} ptr-  (modif_  ::#gtk2hs_type guint)	<- #{peek GdkEventButton, state} ptr-  (button_ ::#gtk2hs_type guint)	<- #{peek GdkEventButton, button} ptr-  (xRoot_  ::#gtk2hs_type gdouble)	<- #{peek GdkEventButton, x_root} ptr-  (yRoot_  ::#gtk2hs_type gdouble)	<- #{peek GdkEventButton, y_root} ptr+  (sent_   ::#gtk2hs_type gint8)        <- #{peek GdkEventButton, send_event} ptr+  (time_   ::#gtk2hs_type guint32)      <- #{peek GdkEventButton, time} ptr+  (x_      ::#gtk2hs_type gdouble)      <- #{peek GdkEventButton, x} ptr+  (y_      ::#gtk2hs_type gdouble)      <- #{peek GdkEventButton, y} ptr+  (modif_  ::#gtk2hs_type guint)        <- #{peek GdkEventButton, state} ptr+  (button_ ::#gtk2hs_type guint)        <- #{peek GdkEventButton, button} ptr+  (xRoot_  ::#gtk2hs_type gdouble)      <- #{peek GdkEventButton, x_root} ptr+  (yRoot_  ::#gtk2hs_type gdouble)      <- #{peek GdkEventButton, y_root} ptr   return $ Button {     eventClick  = but,     eventSent   = toBool sent_,     eventTime   = fromIntegral time_,-    eventX	   = realToFrac x_,-    eventY	   = realToFrac y_,+    eventX         = realToFrac x_,+    eventY         = realToFrac y_,     eventModifier  = (toFlags . fromIntegral) modif_,     eventButton = (toEnum.fromIntegral) button_,     eventXRoot  = realToFrac xRoot_,@@ -492,12 +492,12 @@   marshKey up ptr = do-  (sent_   ::#gtk2hs_type gint8)	<- #{peek GdkEventKey, send_event} ptr-  (time_   ::#gtk2hs_type guint32)	<- #{peek GdkEventKey, time} ptr-  (modif_  ::#gtk2hs_type guint)	<- #{peek GdkEventKey, state} ptr-  (keyval_ ::#gtk2hs_type guint)	<- #{peek GdkEventKey, keyval} ptr+  (sent_   ::#gtk2hs_type gint8)        <- #{peek GdkEventKey, send_event} ptr+  (time_   ::#gtk2hs_type guint32)      <- #{peek GdkEventKey, time} ptr+  (modif_  ::#gtk2hs_type guint)        <- #{peek GdkEventKey, state} ptr+  (keyval_ ::#gtk2hs_type guint)        <- #{peek GdkEventKey, keyval} ptr -  (length_ ::#gtk2hs_type gint)	<- #{peek GdkEventKey, length} ptr+  (length_ ::#gtk2hs_type gint) <- #{peek GdkEventKey, length} ptr   keyChar <- keyvalToChar keyval_   keyName <- unsafeInterleaveIO $ keyvalName keyval_   return $ Key {@@ -513,23 +513,23 @@     eventKeyChar = keyChar }  marshCrossing leave ptr = do-  (sent_   ::#gtk2hs_type gint8)	<- #{peek GdkEventCrossing, send_event} ptr-  (time_   ::#gtk2hs_type guint32)	<- #{peek GdkEventCrossing, time} ptr-  (x_	   ::#gtk2hs_type gdouble)	<- #{peek GdkEventCrossing, x} ptr-  (y_	   ::#gtk2hs_type gdouble)	<- #{peek GdkEventCrossing, y} ptr-  (modif_  ::#gtk2hs_type guint)	<- #{peek GdkEventCrossing, state} ptr-  (xRoot_  ::#gtk2hs_type gdouble)	<- #{peek GdkEventCrossing, x_root} ptr-  (yRoot_  ::#gtk2hs_type gdouble)	<- #{peek GdkEventCrossing, y_root} ptr+  (sent_   ::#gtk2hs_type gint8)        <- #{peek GdkEventCrossing, send_event} ptr+  (time_   ::#gtk2hs_type guint32)      <- #{peek GdkEventCrossing, time} ptr+  (x_      ::#gtk2hs_type gdouble)      <- #{peek GdkEventCrossing, x} ptr+  (y_      ::#gtk2hs_type gdouble)      <- #{peek GdkEventCrossing, y} ptr+  (modif_  ::#gtk2hs_type guint)        <- #{peek GdkEventCrossing, state} ptr+  (xRoot_  ::#gtk2hs_type gdouble)      <- #{peek GdkEventCrossing, x_root} ptr+  (yRoot_  ::#gtk2hs_type gdouble)      <- #{peek GdkEventCrossing, y_root} ptr   (cMode_  ::#gtk2hs_type GdkCrossingMode)-				<- #{peek GdkEventCrossing, mode} ptr+                                <- #{peek GdkEventCrossing, mode} ptr   (nType_  ::#gtk2hs_type GdkNotifyType)-				<- #{peek GdkEventCrossing, detail} ptr-  (modif_  ::#gtk2hs_type guint)	<- #{peek GdkEventCrossing, state} ptr+                                <- #{peek GdkEventCrossing, detail} ptr+  (modif_  ::#gtk2hs_type guint)        <- #{peek GdkEventCrossing, state} ptr   return $ Crossing {     eventSent   = toBool sent_,     eventTime   = fromIntegral time_,-    eventX	   = realToFrac x_,-    eventY	   = realToFrac y_,+    eventX         = realToFrac x_,+    eventY         = realToFrac y_,     eventXRoot  = realToFrac xRoot_,     eventYRoot  = realToFrac yRoot_,     eventLeaves = leave,@@ -539,18 +539,18 @@   marshFocus ptr = do-  (sent_   ::#gtk2hs_type gint8)	<- #{peek GdkEventFocus, send_event} ptr-  (inFocus_::#gtk2hs_type gint16)	<- #{peek GdkEventFocus, in} ptr+  (sent_   ::#gtk2hs_type gint8)        <- #{peek GdkEventFocus, send_event} ptr+  (inFocus_::#gtk2hs_type gint16)       <- #{peek GdkEventFocus, in} ptr   return $ Focus {     eventSent   = toBool sent_,     eventInFocus= toBool inFocus_}  marshConfigure ptr = do-  (sent_   ::#gtk2hs_type gint8)	<- #{peek GdkEventConfigure, send_event} ptr-  (xPar_   ::#gtk2hs_type gint)	<- #{peek GdkEventConfigure, x} ptr-  (yPar_   ::#gtk2hs_type gint)	<- #{peek GdkEventConfigure, y} ptr-  (width_  ::#gtk2hs_type gint)	<- #{peek GdkEventConfigure, width} ptr-  (height_ ::#gtk2hs_type gint)	<- #{peek GdkEventConfigure, height} ptr+  (sent_   ::#gtk2hs_type gint8)        <- #{peek GdkEventConfigure, send_event} ptr+  (xPar_   ::#gtk2hs_type gint) <- #{peek GdkEventConfigure, x} ptr+  (yPar_   ::#gtk2hs_type gint) <- #{peek GdkEventConfigure, y} ptr+  (width_  ::#gtk2hs_type gint) <- #{peek GdkEventConfigure, width} ptr+  (height_ ::#gtk2hs_type gint) <- #{peek GdkEventConfigure, height} ptr   return $ Configure {     eventSent   = toBool sent_,     eventXParent   = fromIntegral xPar_,@@ -560,54 +560,54 @@  {- marshProperty ptr = do-  (sent_   ::#gtk2hs_type gint8)	<- #{peek GdkEventProperty, send_event} ptr-  (time_   ::#gtk2hs_type guint32)	<- #{peek GdkEventProperty, time} ptr+  (sent_   ::#gtk2hs_type gint8)        <- #{peek GdkEventProperty, send_event} ptr+  (time_   ::#gtk2hs_type guint32)      <- #{peek GdkEventProperty, time} ptr   return $ Property {     eventSent   = toBool sent_,     eventTime   = fromIntegral time_} -}  marshProximity contact ptr = do-  (sent_   ::#gtk2hs_type gint8)	<- #{peek GdkEventProximity, send_event} ptr-  (time_   ::#gtk2hs_type guint32)	<- #{peek GdkEventProximity, time} ptr+  (sent_   ::#gtk2hs_type gint8)        <- #{peek GdkEventProximity, send_event} ptr+  (time_   ::#gtk2hs_type guint32)      <- #{peek GdkEventProximity, time} ptr   return $ Proximity {     eventSent   = toBool sent_,     eventTime   = fromIntegral time_,     eventInContact = contact}  marshVisibility ptr = do-  (sent_   ::#gtk2hs_type gint8)	<- #{peek GdkEventVisibility, send_event} ptr+  (sent_   ::#gtk2hs_type gint8)        <- #{peek GdkEventVisibility, send_event} ptr   (state_  ::#gtk2hs_type GdkVisibilityState)-				<- #{peek GdkEventVisibility, state} ptr+                                <- #{peek GdkEventVisibility, state} ptr   return $ Visibility {     eventSent   = toBool sent_,     eventVisible= (toEnum.fromIntegral) state_}  marshScroll ptr = do-  (sent_   ::#gtk2hs_type gint8)	<- #{peek GdkEventScroll, send_event} ptr-  (time_   ::#gtk2hs_type guint32)	<- #{peek GdkEventScroll, time} ptr-  (x_	  ::#gtk2hs_type gdouble)	<- #{peek GdkEventScroll, x} ptr-  (y_	  ::#gtk2hs_type gdouble)	<- #{peek GdkEventScroll, y} ptr+  (sent_   ::#gtk2hs_type gint8)        <- #{peek GdkEventScroll, send_event} ptr+  (time_   ::#gtk2hs_type guint32)      <- #{peek GdkEventScroll, time} ptr+  (x_     ::#gtk2hs_type gdouble)       <- #{peek GdkEventScroll, x} ptr+  (y_     ::#gtk2hs_type gdouble)       <- #{peek GdkEventScroll, y} ptr   (direc_  ::#gtk2hs_type GdkScrollDirection)-				<- #{peek GdkEventScroll, direction} ptr-  (xRoot_  ::#gtk2hs_type gdouble)	<- #{peek GdkEventScroll, x_root} ptr-  (yRoot_  ::#gtk2hs_type gdouble)	<- #{peek GdkEventScroll, y_root} ptr+                                <- #{peek GdkEventScroll, direction} ptr+  (xRoot_  ::#gtk2hs_type gdouble)      <- #{peek GdkEventScroll, x_root} ptr+  (yRoot_  ::#gtk2hs_type gdouble)      <- #{peek GdkEventScroll, y_root} ptr   return $ Scroll {     eventSent   = toBool sent_,     eventTime   = fromIntegral time_,-    eventX	   = realToFrac x_,-    eventY	   = realToFrac y_,+    eventX         = realToFrac x_,+    eventY         = realToFrac y_,     eventDirection  = (toEnum.fromIntegral) direc_,     eventXRoot  = realToFrac xRoot_,     eventYRoot  = realToFrac yRoot_}   marshWindowState ptr = do-  (sent_   ::#gtk2hs_type gint8)	<- #{peek GdkEventWindowState, send_event} ptr+  (sent_   ::#gtk2hs_type gint8)        <- #{peek GdkEventWindowState, send_event} ptr   (wMask_  ::#gtk2hs_type GdkWindowState)-			<- #{peek GdkEventWindowState, changed_mask} ptr+                        <- #{peek GdkEventWindowState, changed_mask} ptr   (wState_ ::#gtk2hs_type GdkWindowState)-			<- #{peek GdkEventWindowState, new_window_state} ptr+                        <- #{peek GdkEventWindowState, new_window_state} ptr   return $ WindowState {     eventSent   = toBool sent_,     eventWindowMask  = (toFlags.fromIntegral) wMask_,

Graphics/UI/Gtk/Gdk/GC.chs view

@@ -82,17 +82,17 @@   ) where  #if GTK_MAJOR_VERSION < 3-import Control.Monad	(when)-import Data.Maybe	(fromJust, isJust)+import Control.Monad    (when)+import Data.Maybe       (fromJust, isJust) import Control.Exception (handle, ErrorCall(..))  import System.Glib.FFI {#import Graphics.UI.Gtk.Types#} import Graphics.UI.Gtk.General.Structs-import Graphics.UI.Gtk.General.Enums	(Function(..), Fill(..), SubwindowMode(..), LineStyle(..),-					 CapStyle(..), JoinStyle(..))+import Graphics.UI.Gtk.General.Enums    (Function(..), Fill(..), SubwindowMode(..), LineStyle(..),+                                         CapStyle(..), JoinStyle(..)) #if GTK_MAJOR_VERSION < 3-{#import Graphics.UI.Gtk.Gdk.Region#}	(Region(Region))+{#import Graphics.UI.Gtk.Gdk.Region#}   (Region(Region)) #endif  {# context lib="gtk" prefix="gdk" #}@@ -103,7 +103,7 @@ gcNew d = do   gcPtr <- {#call unsafe gc_new#} (toDrawable d)   if (gcPtr==nullPtr) then return (error "gcNew: null graphics context.")-		      else wrapNewGObject mkGC (return gcPtr)+                      else wrapNewGObject mkGC (return gcPtr)   -- | Creates a graphics context with specific values.@@ -171,7 +171,7 @@ gcSetDashes gc phase onOffList = do   let onOff :: [{#type gint8#}]       onOff = concatMap (\(on,off) -> [fromIntegral on, fromIntegral off])-	      onOffList+              onOffList   withArray onOff $ \aPtr ->     {#call unsafe gc_set_dashes#} gc (fromIntegral phase) aPtr     (fromIntegral (length onOff))

Graphics/UI/Gtk/Gdk/Gdk.chs view

@@ -37,17 +37,19 @@   pointerIsGrabbed,   keyboardGrab,   keyboardUngrab,-  beep+  beep,+  RGBA(..)   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM) -import System.Glib.Flags		(fromFlags)+import System.Glib.Flags                (fromFlags) import System.Glib.FFI {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Gdk.Cursor#} (Cursor(..)) import Graphics.UI.Gtk.Gdk.Events-import Graphics.UI.Gtk.Gdk.Enums	(EventMask, GrabStatus(..))+import Graphics.UI.Gtk.Gdk.Enums        (EventMask, GrabStatus(..))+import Graphics.UI.Gtk.General.Structs (RGBA(..))  {#context lib="gdk" prefix ="gdk"#}

Graphics/UI/Gtk/Gdk/Keymap.chs view

@@ -121,10 +121,10 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM) import System.Glib.FFI-import Graphics.UI.Gtk.Gdk.Enums	(Modifier(..))-import Graphics.UI.Gtk.Gdk.Keys	(KeyVal (..))+import Graphics.UI.Gtk.Gdk.Enums        (Modifier(..))+import Graphics.UI.Gtk.Gdk.Keys (KeyVal (..)) {#import Graphics.Rendering.Pango.Enums#} {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Gdk/Pixbuf.chs view

@@ -130,10 +130,10 @@ import System.Glib.GObject {#import Graphics.UI.Gtk.Types#} #if GTK_MAJOR_VERSION < 3-import Graphics.UI.Gtk.General.Structs		(Rectangle(..))+import Graphics.UI.Gtk.General.Structs          (Rectangle(..)) #endif-import System.Glib.GError	(GError(..), GErrorClass(..), GErrorDomain,-				propagateGError)+import System.Glib.GError       (GError(..), GErrorClass(..), GErrorDomain,+                                propagateGError) import Graphics.UI.Gtk.Gdk.PixbufData ( PixbufData, mkPixbufData ) #if GTK_MAJOR_VERSION < 3 import Graphics.UI.Gtk.Gdk.Pixmap (Bitmap)@@ -381,7 +381,7 @@ pixbufGetFormats :: [ImageFormat]  pixbufGetFormats = ["png","bmp","wbmp", "gif","ico","ani","jpeg","pnm",-		    "ras","tiff","xpm","xbm","tga"]+                    "ras","tiff","xpm","xbm","tga"]  -- | Save an image to disk. --@@ -398,7 +398,7 @@ --   error codes in 'PixbufError'. -- pixbufSave :: (GlibString string, GlibFilePath fp) => Pixbuf -> fp -> ImageFormat -> [(string, string)] ->-	      IO ()+              IO () pixbufSave pb fname iType options =   let (keys, values) = unzip options in   propagateGError $ \errPtrPtr ->@@ -574,9 +574,9 @@   -> IO Pixbuf pixbufScaleSimple pb width height interp =     wrapNewGObject mkPixbuf $ liftM castPtr $-	{#call pixbuf_scale_simple#} (toPixbuf pb)-	(fromIntegral width) (fromIntegral height)-	(fromIntegral $ fromEnum interp)+        {#call pixbuf_scale_simple#} (toPixbuf pb)+        (fromIntegral width) (fromIntegral height)+        (fromIntegral $ fromEnum interp)  -- | Copy a scaled image part to another image. --@@ -636,7 +636,7 @@   -> Double     -- ^ @scaleX@ - the scale factor in the X direction   -> Double     -- ^ @scaleY@ - the scale factor in the Y direction   -> InterpType -- ^ the interpolation type for the transformation.-  -> Word8 	-- ^ @alpha@ - the transparency+  -> Word8      -- ^ @alpha@ - the transparency   -> IO () pixbufComposite src dest destX destY destWidth destHeight   offsetX offsetY scaleX scaleY interp alpha =

Graphics/UI/Gtk/Gdk/PixbufAnimation.chs view

@@ -80,7 +80,7 @@ import System.Glib.GDateTime import System.Glib.GObject {#import Graphics.UI.Gtk.Types#}-import System.Glib.GError	(propagateGError)+import System.Glib.GError       (propagateGError)  {# context prefix="gdk" #}

Graphics/UI/Gtk/Gdk/Region.chs view

@@ -63,10 +63,10 @@  #if GTK_MAJOR_VERSION < 3 -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.General.Structs	(Point, Rectangle(..))+import Graphics.UI.Gtk.General.Structs  (Point, Rectangle(..))  {# context lib="gdk" prefix="gdk" #} @@ -109,7 +109,7 @@   withArray (concatMap (\(x,y) -> [fromIntegral x, fromIntegral y]) points) $   \(aPtr :: Ptr {#type gint#}) -> do     rPtr <- {#call unsafe region_polygon#} (castPtr aPtr)-	    (fromIntegral (length points)) ((fromIntegral.fromEnum) rule)+            (fromIntegral (length points)) ((fromIntegral.fromEnum) rule)     makeNewRegion rPtr  -- | Copy a 'Region'.

Graphics/UI/Gtk/Gdk/Screen.chs view

@@ -118,7 +118,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString

Graphics/UI/Gtk/General/DNDTypes.chs view

@@ -92,8 +92,8 @@   show (Atom ptr) = show (atomToString ptr :: DefaultGlibString)  atomToString ptr = unsafePerformIO $ do-	strPtr <- {#call unsafe gdk_atom_name#} ptr-	readUTFString strPtr+        strPtr <- {#call unsafe gdk_atom_name#} ptr+        readUTFString strPtr  -- | A 'TargetList' contains information about all possible formats -- (represented as 'TargetTag') that a widget can create or receive in form of

Graphics/UI/Gtk/General/Drag.chs view

@@ -132,7 +132,7 @@   dragMotion   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString@@ -264,7 +264,7 @@     (toDragContext context)     (TargetList nullForeignPtr)   if ttPtr==nullPtr then return Nothing else return (Just (Atom ttPtr))-	+         -- %hash c:41c7 d:af3f -- | Returns the list of targets this widget can accept for drag-and-drop. --

Graphics/UI/Gtk/General/Enums.chs view

@@ -112,7 +112,7 @@ module Graphics.UI.Gtk.Gdk.Enums   ) where -import System.Glib.Flags	(Flags)+import System.Glib.Flags        (Flags) import Graphics.UI.Gtk.Gdk.Enums  {#context lib="gtk" prefix ="gtk"#}@@ -143,10 +143,10 @@ -- | Mouse buttons. -- data MouseButton = LeftButton-		 | MiddleButton-		 | RightButton-		 | OtherButton Int-		   deriving (Eq,Show)+                 | MiddleButton+                 | RightButton+                 | OtherButton Int+                   deriving (Eq,Show)  instance Enum MouseButton where   toEnum 1 = LeftButton@@ -171,9 +171,9 @@ -- | Type of mouse click -- data Click = SingleClick-	   | DoubleClick-	   | TripleClick-	   | ReleaseClick+           | DoubleClick+           | TripleClick+           | ReleaseClick   deriving (Eq,Show,Enum)  -- | Specifies in which corner a child widget should be placed@@ -293,9 +293,9 @@ --   dialog box without list boxes or text fields. -- data Packing = PackRepel-	     | PackGrow-	     | PackNatural-	     deriving (Enum,Eq,Show)+             | PackGrow+             | PackNatural+             deriving (Enum,Eq,Show)  -- The conversions between our Packing type and Gtk's expand and fill -- properties.@@ -419,14 +419,14 @@ {#enum SpinType {underscoreToCase} deriving (Eq,Show)#}  -- | The 'TargetFlags' enumeration is used to specify constraints on an entry---	 in a 'Graphics.UI.Gtk.Gdk.Selection.TargetList'. These flags are only---	 used for drag and drop.+--       in a 'Graphics.UI.Gtk.Gdk.Selection.TargetList'. These flags are only+--       used for drag and drop. -- -- * If the 'TargetSameApp' flag is set, the target will only be selected for---	 drags within a single application.+--       drags within a single application. -- -- * If the 'TargetSameWidget' flag is set, the target will only be selected---	 for drags within a single widget.+--       for drags within a single widget. -- {#enum TargetFlags {underscoreToCase} deriving(Bounded,Eq,Show) #}

Graphics/UI/Gtk/General/General.chs view

@@ -79,9 +79,10 @@   FD   ) where +import Control.Applicative+import Prelude import System.Environment (getProgName, getArgs) import Control.Monad      (liftM, when)-import Control.Applicative ((<$>)) import Control.Concurrent (rtsSupportsBoundThreads, newEmptyMVar,                            putMVar, takeMVar) @@ -91,7 +92,7 @@ import System.Glib.MainLoop ( Priority, priorityLow, priorityDefaultIdle,   priorityHighIdle, priorityDefault, priorityHigh, timeoutRemove, idleRemove,   inputRemove, IOCondition(..), HandlerId )-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) import Graphics.UI.Gtk.Gdk.EventM (EventM) import Control.Monad.Reader (ask) import Control.Monad.Trans (liftIO)@@ -149,8 +150,8 @@   let allArgs = (prog:args)   withMany withUTFString (map stringToGlib allArgs) $ \addrs  ->     withArrayLen       addrs   $ \argc argv ->-    with	       argv    $ \argvp ->-    with	       argc    $ \argcp -> do+    with               argv    $ \argvp ->+    with               argc    $ \argcp -> do       res <- {#call unsafe init_check#} (castPtr argcp) (castPtr argvp)       if (toBool res) then do         argc'   <- peek argcp

Graphics/UI/Gtk/General/IconFactory.chs view

@@ -103,15 +103,16 @@   iconSizeGetName   ) where -import Control.Monad	(liftM)-import Control.Applicative ((<$>))+import Control.Applicative+import Prelude+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.General.Enums	(TextDirection(..), StateType(..))+import Graphics.UI.Gtk.General.Enums    (TextDirection(..), StateType(..)) import Graphics.UI.Gtk.General.StockItems-import Graphics.UI.Gtk.General.Structs	(IconSize(..))+import Graphics.UI.Gtk.General.Structs  (IconSize(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/General/IconTheme.chs view

@@ -139,7 +139,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString

Graphics/UI/Gtk/General/RcStyle.chs view

@@ -455,7 +455,7 @@   rcSetDefaultFiles,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString

Graphics/UI/Gtk/General/Selection.chs view

@@ -102,7 +102,7 @@  import System.Glib.FFI import System.Glib.UTFString-import System.Glib.Flags	(fromFlags)+import System.Glib.Flags        (fromFlags) import System.Glib.Signals import System.Glib.GObject {#import Graphics.UI.Gtk.Types#}

Graphics/UI/Gtk/General/StockItems.hsc view

@@ -174,14 +174,14 @@ -- name will never be freed. This deficiency is built into Gtk however. -- -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Flags-import System.Glib.GList	(GSList, fromGSListRev)-import Graphics.UI.Gtk.Gdk.Events	(Modifier)-import Graphics.UI.Gtk.Gdk.Keys		(KeyVal)+import System.Glib.GList        (GSList, fromGSListRev)+import Graphics.UI.Gtk.Gdk.Events       (Modifier)+import Graphics.UI.Gtk.Gdk.Keys         (KeyVal)  -- |  A synonym for a standard button or icon. --@@ -204,22 +204,22 @@   siTransDom:: DefaultGlibString }  instance Storable StockItem where-  sizeOf _	= #const sizeof(GtkStockItem)-  alignment _	= alignment (undefined::CString)-  peek siPtr	= do+  sizeOf _      = #const sizeof(GtkStockItem)+  alignment _   = alignment (undefined::CString)+  peek siPtr    = do     (stockId    :: CString) <- #{peek GtkStockItem, stock_id} siPtr-    (label	:: CString) <- #{peek GtkStockItem, label} siPtr-    (modifier	:: #gtk2hs_type GdkModifierType)-		            <- #{peek GtkStockItem, modifier} siPtr-    (keyval	:: #gtk2hs_type guint)-			    <- #{peek GtkStockItem, keyval} siPtr-    (transDom	:: CString) <- #{peek GtkStockItem, translation_domain} siPtr+    (label      :: CString) <- #{peek GtkStockItem, label} siPtr+    (modifier   :: #gtk2hs_type GdkModifierType)+                            <- #{peek GtkStockItem, modifier} siPtr+    (keyval     :: #gtk2hs_type guint)+                            <- #{peek GtkStockItem, keyval} siPtr+    (transDom   :: CString) <- #{peek GtkStockItem, translation_domain} siPtr     return $ StockItem {       siStockId  = unsafePerformIO $ peekUTFString' stockId,-      siLabel	 = unsafePerformIO $ peekUTFString' label,+      siLabel    = unsafePerformIO $ peekUTFString' label,       -- &%!?$ c2hs and hsc should agree on types       siModifier = toFlags (fromIntegral modifier),-      siKeyval	 = keyval,+      siKeyval   = keyval,       siTransDom = unsafePerformIO $ peekUTFString' transDom }     where       peekUTFString' :: CString -> IO DefaultGlibString@@ -235,7 +235,7 @@     stockIdPtr <- newUTFString stockId     #{poke GtkStockItem, stock_id} siPtr stockIdPtr     labelPtr   <- newUTFString label-    #{poke GtkStockItem, label}	   siPtr labelPtr+    #{poke GtkStockItem, label}    siPtr labelPtr     #{poke GtkStockItem, modifier} siPtr       ((fromIntegral (fromFlags modifier))::#{gtk2hs_type GdkModifierType})     #{poke GtkStockItem, keyval}   siPtr ((fromIntegral keyval)::#{gtk2hs_type guint})@@ -292,27 +292,27 @@ #if GTK_CHECK_VERSION(2,6,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-about.png>>-stockAbout		:: StockId-stockAbout		= #{const_str GTK_STOCK_ABOUT}+stockAbout              :: StockId+stockAbout              = #{const_str GTK_STOCK_ABOUT} #else-stockAbout		= stockMissingImage+stockAbout              = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-add.png>>-stockAdd		:: StockId-stockAdd		= #{const_str GTK_STOCK_ADD}+stockAdd                :: StockId+stockAdd                = #{const_str GTK_STOCK_ADD}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-apply.png>>-stockApply		:: StockId-stockApply		= #{const_str GTK_STOCK_APPLY}+stockApply              :: StockId+stockApply              = #{const_str GTK_STOCK_APPLY}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-bold.png>>-stockBold		:: StockId-stockBold		= #{const_str GTK_STOCK_BOLD}+stockBold               :: StockId+stockBold               = #{const_str GTK_STOCK_BOLD}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-cancel.png>>-stockCancel		:: StockId-stockCancel		= #{const_str GTK_STOCK_CANCEL}+stockCancel             :: StockId+stockCancel             = #{const_str GTK_STOCK_CANCEL}  #if GTK_CHECK_VERSION(2,16,0) -- | <<http://library.gnome.org/devel/gtk/stable/gtk-caps-lock-warning.png>>@@ -321,48 +321,48 @@ #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-cdrom.png>>-stockCDROM		:: StockId-stockCDROM		= #{const_str GTK_STOCK_CDROM}+stockCDROM              :: StockId+stockCDROM              = #{const_str GTK_STOCK_CDROM}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-clear.png>>-stockClear		:: StockId-stockClear		= #{const_str GTK_STOCK_CLEAR}+stockClear              :: StockId+stockClear              = #{const_str GTK_STOCK_CLEAR}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-close.png>>-stockClose		:: StockId-stockClose		= #{const_str GTK_STOCK_CLOSE}+stockClose              :: StockId+stockClose              = #{const_str GTK_STOCK_CLOSE} #if GTK_CHECK_VERSION(2,2,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-color-picker.png>>-stockColorPicker	:: StockId-stockColorPicker	= #{const_str GTK_STOCK_COLOR_PICKER}+stockColorPicker        :: StockId+stockColorPicker        = #{const_str GTK_STOCK_COLOR_PICKER} #else stockColorPicker        = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-convert.png>>-stockConvert		:: StockId-stockConvert		= #{const_str GTK_STOCK_CONVERT}+stockConvert            :: StockId+stockConvert            = #{const_str GTK_STOCK_CONVERT} #if GTK_CHECK_VERSION(2,6,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-connect.png>>-stockConnect		:: StockId-stockConnect		= #{const_str GTK_STOCK_CONNECT}+stockConnect            :: StockId+stockConnect            = #{const_str GTK_STOCK_CONNECT} #else-stockConnect		= stockMissingImage+stockConnect            = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-copy.png>>-stockCopy		:: StockId-stockCopy		= #{const_str GTK_STOCK_COPY}+stockCopy               :: StockId+stockCopy               = #{const_str GTK_STOCK_COPY}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-cut.png>>-stockCut		:: StockId-stockCut		= #{const_str GTK_STOCK_CUT}+stockCut                :: StockId+stockCut                = #{const_str GTK_STOCK_CUT}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-delete.png>>-stockDelete		:: StockId-stockDelete		= #{const_str GTK_STOCK_DELETE}+stockDelete             :: StockId+stockDelete             = #{const_str GTK_STOCK_DELETE}  #if GTK_CHECK_VERSION(2,6,0) -- | <<http://library.gnome.org/devel/gtk/stable/gtk-dialog-authentication.png>>@@ -373,27 +373,27 @@ #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-dialog-error.png>>-stockDialogError	:: StockId-stockDialogError	= #{const_str GTK_STOCK_DIALOG_ERROR}+stockDialogError        :: StockId+stockDialogError        = #{const_str GTK_STOCK_DIALOG_ERROR}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-dialog-info.png>>-stockDialogInfo		:: StockId-stockDialogInfo		= #{const_str GTK_STOCK_DIALOG_INFO}+stockDialogInfo         :: StockId+stockDialogInfo         = #{const_str GTK_STOCK_DIALOG_INFO}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-dialog-question.png>>-stockDialogQuestion	:: StockId-stockDialogQuestion	= #{const_str GTK_STOCK_DIALOG_QUESTION}+stockDialogQuestion     :: StockId+stockDialogQuestion     = #{const_str GTK_STOCK_DIALOG_QUESTION}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-dialog-warning.png>>-stockDialogWarning	:: StockId-stockDialogWarning	= #{const_str GTK_STOCK_DIALOG_WARNING}+stockDialogWarning      :: StockId+stockDialogWarning      = #{const_str GTK_STOCK_DIALOG_WARNING} #if GTK_CHECK_VERSION(2,6,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-directory.png>>-stockDirectory		:: StockId-stockDirectory		= #{const_str GTK_STOCK_DIRECTORY}+stockDirectory          :: StockId+stockDirectory          = #{const_str GTK_STOCK_DIRECTORY} #else-stockDirectory		= stockMissingImage+stockDirectory          = stockMissingImage #endif  #if GTK_CHECK_VERSION(2,12,0)@@ -405,237 +405,237 @@ #if GTK_CHECK_VERSION(2,6,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-disconnect.png>>-stockDisconnect		:: StockId-stockDisconnect		= #{const_str GTK_STOCK_DISCONNECT}+stockDisconnect         :: StockId+stockDisconnect         = #{const_str GTK_STOCK_DISCONNECT} #else-stockDisconnect		= stockMissingImage+stockDisconnect         = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-dnd.png>>-stockDnd		:: StockId-stockDnd		= #{const_str GTK_STOCK_DND}+stockDnd                :: StockId+stockDnd                = #{const_str GTK_STOCK_DND}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-dnd-multiple.png>>-stockDndMultiple	:: StockId-stockDndMultiple	= #{const_str GTK_STOCK_DND_MULTIPLE}+stockDndMultiple        :: StockId+stockDndMultiple        = #{const_str GTK_STOCK_DND_MULTIPLE} #if GTK_CHECK_VERSION(2,6,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-edit.png>>-stockEdit		:: StockId-stockEdit		= #{const_str GTK_STOCK_EDIT}+stockEdit               :: StockId+stockEdit               = #{const_str GTK_STOCK_EDIT} #else-stockEdit		= stockMissingImage+stockEdit               = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-execute.png>>-stockExecute		:: StockId-stockExecute		= #{const_str GTK_STOCK_EXECUTE}+stockExecute            :: StockId+stockExecute            = #{const_str GTK_STOCK_EXECUTE} #if GTK_CHECK_VERSION(2,6,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-file.png>>-stockFile		:: StockId-stockFile		= #{const_str GTK_STOCK_FILE}+stockFile               :: StockId+stockFile               = #{const_str GTK_STOCK_FILE} #else-stockFile		= stockMissingImage+stockFile               = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-find.png>>-stockFind		:: StockId-stockFind		= #{const_str GTK_STOCK_FIND}+stockFind               :: StockId+stockFind               = #{const_str GTK_STOCK_FIND}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-find-and-replace.png>>-stockFindAndRelpace	:: StockId-stockFindAndRelpace	= #{const_str GTK_STOCK_FIND_AND_REPLACE}+stockFindAndRelpace     :: StockId+stockFindAndRelpace     = #{const_str GTK_STOCK_FIND_AND_REPLACE}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-floppy.png>>-stockFloppy		:: StockId-stockFloppy		= #{const_str GTK_STOCK_FLOPPY}+stockFloppy             :: StockId+stockFloppy             = #{const_str GTK_STOCK_FLOPPY} #if GTK_CHECK_VERSION(2,8,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-fullscreen.png>>-stockFullscreen		:: StockId-stockFullscreen		= #{const_str GTK_STOCK_FULLSCREEN}+stockFullscreen         :: StockId+stockFullscreen         = #{const_str GTK_STOCK_FULLSCREEN} #else-stockFullscreen		= stockMissingImage+stockFullscreen         = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-goto-bottom.png>>-stockGotoBottom		:: StockId-stockGotoBottom		= #{const_str GTK_STOCK_GOTO_BOTTOM}+stockGotoBottom         :: StockId+stockGotoBottom         = #{const_str GTK_STOCK_GOTO_BOTTOM}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-goto-first-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-goto-first-rtl.png>>-stockGotoFirst		:: StockId-stockGotoFirst		= #{const_str GTK_STOCK_GOTO_FIRST}+stockGotoFirst          :: StockId+stockGotoFirst          = #{const_str GTK_STOCK_GOTO_FIRST}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-goto-last-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-goto-last-rtl.png>>-stockGotoLast		:: StockId-stockGotoLast		= #{const_str GTK_STOCK_GOTO_LAST}+stockGotoLast           :: StockId+stockGotoLast           = #{const_str GTK_STOCK_GOTO_LAST}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-goto-top.png>>-stockGotoTop		:: StockId-stockGotoTop		= #{const_str GTK_STOCK_GOTO_TOP}+stockGotoTop            :: StockId+stockGotoTop            = #{const_str GTK_STOCK_GOTO_TOP}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-go-back-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-go-back-rtl.png>>-stockGoBack		:: StockId-stockGoBack		= #{const_str GTK_STOCK_GO_BACK}+stockGoBack             :: StockId+stockGoBack             = #{const_str GTK_STOCK_GO_BACK}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-go-down.png>>-stockGoDown		:: StockId-stockGoDown		= #{const_str GTK_STOCK_GO_DOWN}+stockGoDown             :: StockId+stockGoDown             = #{const_str GTK_STOCK_GO_DOWN}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-go-forward-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-go-forward-rtl.png>>-stockGoForward		:: StockId-stockGoForward		= #{const_str GTK_STOCK_GO_FORWARD}+stockGoForward          :: StockId+stockGoForward          = #{const_str GTK_STOCK_GO_FORWARD}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-go-up.png>>-stockGoUp		:: StockId-stockGoUp		= #{const_str GTK_STOCK_GO_UP}+stockGoUp               :: StockId+stockGoUp               = #{const_str GTK_STOCK_GO_UP} #if GTK_CHECK_VERSION(2,4,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-harddisk.png>>-stockHarddisk		:: StockId-stockHarddisk		= #{const_str GTK_STOCK_HARDDISK}+stockHarddisk           :: StockId+stockHarddisk           = #{const_str GTK_STOCK_HARDDISK} #else-stockHarddisk		= stockMissingImage+stockHarddisk           = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-help.png>>-stockHelp		:: StockId-stockHelp		= #{const_str GTK_STOCK_HELP}+stockHelp               :: StockId+stockHelp               = #{const_str GTK_STOCK_HELP}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-home.png>>-stockHome		:: StockId-stockHome		= #{const_str GTK_STOCK_HOME}+stockHome               :: StockId+stockHome               = #{const_str GTK_STOCK_HOME} #if GTK_CHECK_VERSION(2,4,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-indent-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-indent-rtl.png>>-stockIndent		:: StockId-stockIndent		= #{const_str GTK_STOCK_INDENT}+stockIndent             :: StockId+stockIndent             = #{const_str GTK_STOCK_INDENT} #else-stockIndent		= stockMissingImage+stockIndent             = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-index.png>>-stockIndex		:: StockId-stockIndex		= #{const_str GTK_STOCK_INDEX}+stockIndex              :: StockId+stockIndex              = #{const_str GTK_STOCK_INDEX} #if GTK_CHECK_VERSION(2,8,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-info.png>>-stockInfo		:: StockId-stockInfo		= #{const_str GTK_STOCK_INFO}+stockInfo               :: StockId+stockInfo               = #{const_str GTK_STOCK_INFO} #else-stockInfo		= stockMissingImage+stockInfo               = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-italic.png>>-stockItalic		:: StockId-stockItalic		= #{const_str GTK_STOCK_ITALIC}+stockItalic             :: StockId+stockItalic             = #{const_str GTK_STOCK_ITALIC}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-jump-to-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-jump-to-rtl.png>>-stockJumpTo		:: StockId-stockJumpTo		= #{const_str GTK_STOCK_JUMP_TO}+stockJumpTo             :: StockId+stockJumpTo             = #{const_str GTK_STOCK_JUMP_TO}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-justify-center.png>>-stockJustifyCenter	:: StockId-stockJustifyCenter	= #{const_str GTK_STOCK_JUSTIFY_CENTER}+stockJustifyCenter      :: StockId+stockJustifyCenter      = #{const_str GTK_STOCK_JUSTIFY_CENTER}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-justify-fill.png>>-stockJustifyFill	:: StockId-stockJustifyFill	= #{const_str GTK_STOCK_JUSTIFY_FILL}+stockJustifyFill        :: StockId+stockJustifyFill        = #{const_str GTK_STOCK_JUSTIFY_FILL}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-justify-left.png>>-stockJustifyLeft	:: StockId-stockJustifyLeft	= #{const_str GTK_STOCK_JUSTIFY_LEFT}+stockJustifyLeft        :: StockId+stockJustifyLeft        = #{const_str GTK_STOCK_JUSTIFY_LEFT}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-justify-right.png>>-stockJustifyRight	:: StockId-stockJustifyRight	= #{const_str GTK_STOCK_JUSTIFY_RIGHT}+stockJustifyRight       :: StockId+stockJustifyRight       = #{const_str GTK_STOCK_JUSTIFY_RIGHT}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-leave-fullscreen.png>> stockLeaveFullscreen    :: StockId stockLeaveFullscreen    = #{const_str GTK_STOCK_LEAVE_FULLSCREEN}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-missing-image.png>>-stockMissingImage	:: StockId-stockMissingImage	= #{const_str GTK_STOCK_MISSING_IMAGE}+stockMissingImage       :: StockId+stockMissingImage       = #{const_str GTK_STOCK_MISSING_IMAGE} #if GTK_CHECK_VERSION(2,6,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-media-forward-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-media-forward-rtl.png>>-stockMediaForward	:: StockId-stockMediaForward	= #{const_str GTK_STOCK_MEDIA_FORWARD}+stockMediaForward       :: StockId+stockMediaForward       = #{const_str GTK_STOCK_MEDIA_FORWARD}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-media-next-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-media-next-rtl.png>>-stockMediaNext  	:: StockId-stockMediaNext  	= #{const_str GTK_STOCK_MEDIA_NEXT}+stockMediaNext          :: StockId+stockMediaNext          = #{const_str GTK_STOCK_MEDIA_NEXT}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-media-pause.png>>-stockMediaPause		:: StockId-stockMediaPause		= #{const_str GTK_STOCK_MEDIA_PAUSE}+stockMediaPause         :: StockId+stockMediaPause         = #{const_str GTK_STOCK_MEDIA_PAUSE}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-media-play-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-media-play-rtl.png>>-stockMediaPlay		:: StockId-stockMediaPlay		= #{const_str GTK_STOCK_MEDIA_PLAY}+stockMediaPlay          :: StockId+stockMediaPlay          = #{const_str GTK_STOCK_MEDIA_PLAY}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-media-previous-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-media-previous-rtl.png>>-stockMediaPrevious	:: StockId-stockMediaPrevious	= #{const_str GTK_STOCK_MEDIA_PREVIOUS}+stockMediaPrevious      :: StockId+stockMediaPrevious      = #{const_str GTK_STOCK_MEDIA_PREVIOUS}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-media-record.png>>-stockMediaRecord	:: StockId-stockMediaRecord	= #{const_str GTK_STOCK_MEDIA_RECORD}+stockMediaRecord        :: StockId+stockMediaRecord        = #{const_str GTK_STOCK_MEDIA_RECORD}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-media-rewind-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-media-rewind-rtl.png>>-stockMediaRewind	:: StockId-stockMediaRewind	= #{const_str GTK_STOCK_MEDIA_REWIND}+stockMediaRewind        :: StockId+stockMediaRewind        = #{const_str GTK_STOCK_MEDIA_REWIND}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-media-stop.png>>-stockMediaStop		:: StockId-stockMediaStop		= #{const_str GTK_STOCK_MEDIA_STOP}+stockMediaStop          :: StockId+stockMediaStop          = #{const_str GTK_STOCK_MEDIA_STOP} #else-stockMediaForward	= stockMissingImage-stockMediaNext  	= stockMissingImage-stockMediaPause		= stockMissingImage-stockMediaPlay		= stockMissingImage-stockMediaPrevious	= stockMissingImage-stockMediaRecord	= stockMissingImage-stockMediaRewind	= stockMissingImage-stockMediaStop		= stockMissingImage+stockMediaForward       = stockMissingImage+stockMediaNext          = stockMissingImage+stockMediaPause         = stockMissingImage+stockMediaPlay          = stockMissingImage+stockMediaPrevious      = stockMissingImage+stockMediaRecord        = stockMissingImage+stockMediaRewind        = stockMissingImage+stockMediaStop          = stockMissingImage #endif #if GTK_CHECK_VERSION(2,4,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-network.png>>-stockNetwork		:: StockId-stockNetwork		= #{const_str GTK_STOCK_NETWORK}+stockNetwork            :: StockId+stockNetwork            = #{const_str GTK_STOCK_NETWORK} #else-stockNetwork		= stockMissingImage+stockNetwork            = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-new.png>>-stockNew		:: StockId-stockNew		= #{const_str GTK_STOCK_NEW}+stockNew                :: StockId+stockNew                = #{const_str GTK_STOCK_NEW}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-no.png>>-stockNo			:: StockId-stockNo			= #{const_str GTK_STOCK_NO}+stockNo                 :: StockId+stockNo                 = #{const_str GTK_STOCK_NO}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-ok.png>>-stockOk			:: StockId-stockOk			= #{const_str GTK_STOCK_OK}+stockOk                 :: StockId+stockOk                 = #{const_str GTK_STOCK_OK}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-open.png>>-stockOpen		:: StockId-stockOpen		= #{const_str GTK_STOCK_OPEN}+stockOpen               :: StockId+stockOpen               = #{const_str GTK_STOCK_OPEN} #if GTK_CHECK_VERSION(2,10,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-orientation-landscape.png>>@@ -667,16 +667,16 @@ #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-paste.png>>-stockPaste		:: StockId-stockPaste		= #{const_str GTK_STOCK_PASTE}+stockPaste              :: StockId+stockPaste              = #{const_str GTK_STOCK_PASTE}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-preferences.png>>-stockPreferences	:: StockId-stockPreferences	= #{const_str GTK_STOCK_PREFERENCES}+stockPreferences        :: StockId+stockPreferences        = #{const_str GTK_STOCK_PREFERENCES}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-print.png>>-stockPrint		:: StockId-stockPrint		= #{const_str GTK_STOCK_PRINT}+stockPrint              :: StockId+stockPrint              = #{const_str GTK_STOCK_PRINT}  #if GTK_CHECK_VERSION(2,14,0) -- | <<http://library.gnome.org/devel/gtk/stable/gtk-print-error.png>>@@ -697,121 +697,121 @@ #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-print-preview.png>>-stockPrintPreview	:: StockId-stockPrintPreview	= #{const_str GTK_STOCK_PRINT_PREVIEW}+stockPrintPreview       :: StockId+stockPrintPreview       = #{const_str GTK_STOCK_PRINT_PREVIEW}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-properties.png>>-stockProperties		:: StockId-stockProperties		= #{const_str GTK_STOCK_PROPERTIES}+stockProperties         :: StockId+stockProperties         = #{const_str GTK_STOCK_PROPERTIES}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-quit.png>>-stockQuit		:: StockId-stockQuit		= #{const_str GTK_STOCK_QUIT}+stockQuit               :: StockId+stockQuit               = #{const_str GTK_STOCK_QUIT}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-redo-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-redo-rtl.png>>-stockRedo		:: StockId-stockRedo		= #{const_str GTK_STOCK_REDO}+stockRedo               :: StockId+stockRedo               = #{const_str GTK_STOCK_REDO}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-refresh.png>>-stockRefresh		:: StockId-stockRefresh		= #{const_str GTK_STOCK_REFRESH}+stockRefresh            :: StockId+stockRefresh            = #{const_str GTK_STOCK_REFRESH}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-remove.png>>-stockRemove		:: StockId-stockRemove		= #{const_str GTK_STOCK_REMOVE}+stockRemove             :: StockId+stockRemove             = #{const_str GTK_STOCK_REMOVE}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-revert-to-saved-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-revert-to-saved-rtl.png>>-stockRevertToSaved	:: StockId-stockRevertToSaved	= #{const_str GTK_STOCK_REVERT_TO_SAVED}+stockRevertToSaved      :: StockId+stockRevertToSaved      = #{const_str GTK_STOCK_REVERT_TO_SAVED}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-save.png>>-stockSave		:: StockId-stockSave		= #{const_str GTK_STOCK_SAVE}+stockSave               :: StockId+stockSave               = #{const_str GTK_STOCK_SAVE}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-save-as.png>>-stockSaveAs		:: StockId-stockSaveAs		= #{const_str GTK_STOCK_SAVE_AS}+stockSaveAs             :: StockId+stockSaveAs             = #{const_str GTK_STOCK_SAVE_AS} #if GTK_CHECK_VERSION(2,10,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-select-all.png>>-stockSelectAll		:: StockId-stockSelectAll		= #{const_str GTK_STOCK_SELECT_ALL}+stockSelectAll          :: StockId+stockSelectAll          = #{const_str GTK_STOCK_SELECT_ALL} #else-stockSelectAll		= stockMissingImage+stockSelectAll          = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-select-color.png>>-stockSelectColor	:: StockId-stockSelectColor	= #{const_str GTK_STOCK_SELECT_COLOR}+stockSelectColor        :: StockId+stockSelectColor        = #{const_str GTK_STOCK_SELECT_COLOR}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-font.png>>-stockSelectFont		:: StockId-stockSelectFont		= #{const_str GTK_STOCK_SELECT_FONT}+stockSelectFont         :: StockId+stockSelectFont         = #{const_str GTK_STOCK_SELECT_FONT}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-sort-ascending.png>>-stockSortAscending	:: StockId-stockSortAscending	= #{const_str GTK_STOCK_SORT_ASCENDING}+stockSortAscending      :: StockId+stockSortAscending      = #{const_str GTK_STOCK_SORT_ASCENDING}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-sort-descending.png>>-stockSortDescending	:: StockId-stockSortDescending	= #{const_str GTK_STOCK_SORT_DESCENDING}+stockSortDescending     :: StockId+stockSortDescending     = #{const_str GTK_STOCK_SORT_DESCENDING}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-spell-check.png>>-stockSpellCheck		:: StockId-stockSpellCheck		= #{const_str GTK_STOCK_SPELL_CHECK}+stockSpellCheck         :: StockId+stockSpellCheck         = #{const_str GTK_STOCK_SPELL_CHECK}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-stop.png>>-stockStop		:: StockId-stockStop		= #{const_str GTK_STOCK_STOP}+stockStop               :: StockId+stockStop               = #{const_str GTK_STOCK_STOP}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-strikethrough.png>>-stockStrikethrough	:: StockId-stockStrikethrough	= #{const_str GTK_STOCK_STRIKETHROUGH}+stockStrikethrough      :: StockId+stockStrikethrough      = #{const_str GTK_STOCK_STRIKETHROUGH}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-undelete-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-undelete-rtl.png>>-stockUndelete		:: StockId-stockUndelete		= #{const_str GTK_STOCK_UNDELETE}+stockUndelete           :: StockId+stockUndelete           = #{const_str GTK_STOCK_UNDELETE}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-underline.png>>-stockUnderline		:: StockId-stockUnderline		= #{const_str GTK_STOCK_UNDERLINE}+stockUnderline          :: StockId+stockUnderline          = #{const_str GTK_STOCK_UNDERLINE}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-undo-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-undo-rtl.png>>-stockUndo		:: StockId-stockUndo		= #{const_str GTK_STOCK_UNDO}+stockUndo               :: StockId+stockUndo               = #{const_str GTK_STOCK_UNDO} #if GTK_CHECK_VERSION(2,4,0)  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-unindent-ltr.png>> -- <<http://library.gnome.org/devel/gtk/stable/gtk-unindent-rtl.png>>-stockUnindent		:: StockId-stockUnindent		= #{const_str GTK_STOCK_UNINDENT}+stockUnindent           :: StockId+stockUnindent           = #{const_str GTK_STOCK_UNINDENT} #else-stockUnindent		= stockMissingImage+stockUnindent           = stockMissingImage #endif  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-yes.png>>-stockYes		:: StockId-stockYes		= #{const_str GTK_STOCK_YES}+stockYes                :: StockId+stockYes                = #{const_str GTK_STOCK_YES}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-zoom-100.png>>-stockZoom100		:: StockId-stockZoom100		= #{const_str GTK_STOCK_ZOOM_100}+stockZoom100            :: StockId+stockZoom100            = #{const_str GTK_STOCK_ZOOM_100}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-zoom-fit.png>>-stockZoomFit		:: StockId-stockZoomFit		= #{const_str GTK_STOCK_ZOOM_FIT}+stockZoomFit            :: StockId+stockZoomFit            = #{const_str GTK_STOCK_ZOOM_FIT}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-zoom-in.png>>-stockZoomIn		:: StockId-stockZoomIn		= #{const_str GTK_STOCK_ZOOM_IN}+stockZoomIn             :: StockId+stockZoomIn             = #{const_str GTK_STOCK_ZOOM_IN}  -- | <<http://library.gnome.org/devel/gtk/stable/gtk-zoom-out.png>>-stockZoomOut		:: StockId-stockZoomOut		= #{const_str GTK_STOCK_ZOOM_OUT}+stockZoomOut            :: StockId+stockZoomOut            = #{const_str GTK_STOCK_ZOOM_OUT}

Graphics/UI/Gtk/General/Structs.hsc view

@@ -38,6 +38,7 @@   Point,   Rectangle(..),   Color(..),+  RGBA(..), #if GTK_MAJOR_VERSION < 3   GCValues(..),   pokeGCValues,@@ -118,20 +119,20 @@   KeymapKey (..)   ) where -import Control.Monad		(liftM)+import Control.Monad            (liftM) import Data.IORef import Control.Exception (handle, ErrorCall(..))  import System.Glib.FFI import System.Glib.UTFString ( UTFCorrection, ofsToUTF )-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)-import System.Glib.GObject		(makeNewGObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject)+import System.Glib.GObject              (makeNewGObject) import Graphics.UI.Gtk.Types #if GTK_MAJOR_VERSION < 3 import Graphics.UI.Gtk.Gdk.Enums (Function, Fill, SubwindowMode,                                   LineStyle, CapStyle, JoinStyle) #endif-import Graphics.UI.Gtk.General.Enums	(StateType)+import Graphics.UI.Gtk.General.Enums    (StateType) import Graphics.UI.Gtk.General.DNDTypes (InfoId, Atom(Atom) , SelectionTag,                                          TargetTag, SelectionTypeTag) import Graphics.Rendering.Pango.Structs ( Color(..), Rectangle(..) )@@ -147,8 +148,8 @@   sizeOf _ = #{const sizeof(GdkPoint)}   alignment _ = alignment (undefined:: #gtk2hs_type gint)   peek ptr = do-    (x_	     ::#gtk2hs_type gint)	<- #{peek GdkPoint, x} ptr-    (y_	     ::#gtk2hs_type gint)	<- #{peek GdkPoint, y} ptr+    (x_      ::#gtk2hs_type gint)       <- #{peek GdkPoint, x} ptr+    (y_      ::#gtk2hs_type gint)       <- #{peek GdkPoint, y} ptr     return $ (fromIntegral x_, fromIntegral y_)   poke ptr (x, y) = do     #{poke GdkPoint, x} ptr ((fromIntegral x)::#gtk2hs_type gint)@@ -158,12 +159,12 @@   sizeOf _ = #{const sizeof(GdkRectangle)}   alignment _ = alignment (undefined:: #gtk2hs_type gint)   peek ptr = do-    (x_	     ::#gtk2hs_type gint)	<- #{peek GdkRectangle, x} ptr-    (y_	     ::#gtk2hs_type gint)	<- #{peek GdkRectangle, y} ptr-    (width_  ::#gtk2hs_type gint)	<- #{peek GdkRectangle, width} ptr-    (height_ ::#gtk2hs_type gint)	<- #{peek GdkRectangle, height} ptr+    (x_      ::#gtk2hs_type gint)       <- #{peek GdkRectangle, x} ptr+    (y_      ::#gtk2hs_type gint)       <- #{peek GdkRectangle, y} ptr+    (width_  ::#gtk2hs_type gint)       <- #{peek GdkRectangle, width} ptr+    (height_ ::#gtk2hs_type gint)       <- #{peek GdkRectangle, height} ptr     return $ Rectangle (fromIntegral x_) (fromIntegral y_)-		       (fromIntegral width_) (fromIntegral height_)+                       (fromIntegral width_) (fromIntegral height_)   poke ptr (Rectangle x y width height) = do     #{poke GdkRectangle, x} ptr ((fromIntegral x)::#gtk2hs_type gint)     #{poke GdkRectangle, y} ptr ((fromIntegral y)::#gtk2hs_type gint)@@ -174,7 +175,7 @@   sizeOf _ = #{const sizeof(GdkColor)}   alignment _ = alignment (undefined::#gtk2hs_type guint32)   peek ptr = do-    red	   <- #{peek GdkColor, red} ptr+    red    <- #{peek GdkColor, red} ptr     green  <- #{peek GdkColor, green} ptr     blue   <- #{peek GdkColor, blue} ptr     return $ Color red green blue@@ -189,6 +190,24 @@ #endif     return () +data RGBA = RGBA Double Double Double Double++instance Storable RGBA where+  sizeOf _ = #{const sizeof(GdkRGBA)}+  alignment _ = alignment (undefined::#gtk2hs_type guint32)+  peek ptr = do+    red    <- #{peek GdkRGBA, red} ptr+    green  <- #{peek GdkRGBA, green} ptr+    blue   <- #{peek GdkRGBA, blue} ptr+    alpha  <- #{peek GdkRGBA, alpha} ptr+    return $ RGBA red green blue alpha+  poke ptr (RGBA red green blue alpha) = do+    #{poke GdkRGBA, red}   ptr red+    #{poke GdkRGBA, green} ptr green+    #{poke GdkRGBA, blue}  ptr blue+    #{poke GdkRGBA, alpha} ptr alpha+    return ()+ #if GTK_MAJOR_VERSION < 3 type ColorMap = () @@ -247,40 +266,40 @@      foreground_ <- peek (#{ptr GdkGCValues, foreground} ptr)     background_ <- peek (#{ptr GdkGCValues, background} ptr)-    (function_	:: #{gtk2hs_type GdkFunction}) <- #{peek GdkGCValues, function} ptr-    (fill_	:: #{gtk2hs_type GdkFill}) <- #{peek GdkGCValues, fill} ptr-    tile_	<- do-		     pPtr <- #{peek GdkGCValues, tile} ptr-		     if (pPtr==nullPtr) then return Nothing else-		       liftM Just $ makeNewGObject mkPixmap $ return pPtr-    stipple_	<- do-		     pPtr <- #{peek GdkGCValues, stipple} ptr-		     if (pPtr==nullPtr) then return Nothing else-		       liftM Just $ makeNewGObject mkPixmap $ return pPtr-    clipMask_	<- do-		     pPtr <- #{peek GdkGCValues, clip_mask} ptr-		     if (pPtr==nullPtr) then return Nothing else-		       liftM Just $ makeNewGObject mkPixmap $ return pPtr-    (subwindow_	:: #{gtk2hs_type GdkSubwindowMode})-		<- #{peek GdkGCValues, subwindow_mode} ptr-    (tsXOrigin_	:: #{gtk2hs_type gint})-		<- #{peek GdkGCValues, ts_x_origin} ptr-    (tsYOrigin_	:: #{gtk2hs_type gint})-		<- #{peek GdkGCValues, ts_y_origin} ptr+    (function_  :: #{gtk2hs_type GdkFunction}) <- #{peek GdkGCValues, function} ptr+    (fill_      :: #{gtk2hs_type GdkFill}) <- #{peek GdkGCValues, fill} ptr+    tile_       <- do+                     pPtr <- #{peek GdkGCValues, tile} ptr+                     if (pPtr==nullPtr) then return Nothing else+                       liftM Just $ makeNewGObject mkPixmap $ return pPtr+    stipple_    <- do+                     pPtr <- #{peek GdkGCValues, stipple} ptr+                     if (pPtr==nullPtr) then return Nothing else+                       liftM Just $ makeNewGObject mkPixmap $ return pPtr+    clipMask_   <- do+                     pPtr <- #{peek GdkGCValues, clip_mask} ptr+                     if (pPtr==nullPtr) then return Nothing else+                       liftM Just $ makeNewGObject mkPixmap $ return pPtr+    (subwindow_ :: #{gtk2hs_type GdkSubwindowMode})+                <- #{peek GdkGCValues, subwindow_mode} ptr+    (tsXOrigin_ :: #{gtk2hs_type gint})+                <- #{peek GdkGCValues, ts_x_origin} ptr+    (tsYOrigin_ :: #{gtk2hs_type gint})+                <- #{peek GdkGCValues, ts_y_origin} ptr     (clipXOrigin_:: #{gtk2hs_type gint})-		<- #{peek GdkGCValues, clip_x_origin} ptr+                <- #{peek GdkGCValues, clip_x_origin} ptr     (clipYOrigin_:: #{gtk2hs_type gint})-		<- #{peek GdkGCValues, clip_y_origin} ptr-    (graphics_	:: #{gtk2hs_type gint})-		<- #{peek GdkGCValues, graphics_exposures} ptr-    (lineWidth_	:: #{gtk2hs_type gint})-		<- #{peek GdkGCValues, line_width} ptr-    (lineStyle_	:: #{gtk2hs_type GdkLineStyle})-		<- #{peek GdkGCValues, line_style} ptr-    (capStyle_	:: #{gtk2hs_type GdkCapStyle})-		<- #{peek GdkGCValues, cap_style} ptr-    (joinStyle_	:: #{gtk2hs_type GdkJoinStyle})-		<- #{peek GdkGCValues, join_style} ptr+                <- #{peek GdkGCValues, clip_y_origin} ptr+    (graphics_  :: #{gtk2hs_type gint})+                <- #{peek GdkGCValues, graphics_exposures} ptr+    (lineWidth_ :: #{gtk2hs_type gint})+                <- #{peek GdkGCValues, line_width} ptr+    (lineStyle_ :: #{gtk2hs_type GdkLineStyle})+                <- #{peek GdkGCValues, line_style} ptr+    (capStyle_  :: #{gtk2hs_type GdkCapStyle})+                <- #{peek GdkGCValues, cap_style} ptr+    (joinStyle_ :: #{gtk2hs_type GdkJoinStyle})+                <- #{peek GdkGCValues, join_style} ptr     return $ GCValues {       foreground = foreground_,       background = background_,@@ -458,8 +477,8 @@   sizeOf _ = #{const sizeof(GtkRequisition)}   alignment _ = alignment (undefined::#gtk2hs_type gint)   peek ptr = do-    (width_  ::#gtk2hs_type gint)	<- #{peek GtkRequisition, width} ptr-    (height_ ::#gtk2hs_type gint)	<- #{peek GtkRequisition, height} ptr+    (width_  ::#gtk2hs_type gint)       <- #{peek GtkRequisition, width} ptr+    (height_ ::#gtk2hs_type gint)       <- #{peek GtkRequisition, height} ptr     return $ Requisition (fromIntegral width_) (fromIntegral height_)   poke ptr (Requisition width height) = do     #{poke GtkRequisition, width} ptr ((fromIntegral width)::#gtk2hs_type gint)@@ -538,7 +557,7 @@   -- | \"Close\" was pressed.   --   -- * This value is returned from the \"Close\" stock dialog button.-	| ResponseClose+        | ResponseClose    -- | \"Yes\" was pressed.   --@@ -553,7 +572,7 @@   -- | \"Apply\" was pressed.   --   -- * This value is returned from the \"Apply\" stock dialog button.-	| ResponseApply+        | ResponseApply    -- |  \"Help\" was pressed.   --@@ -767,7 +786,7 @@ -- | Extract the buttons of a fileselection. -- fileSelectionGetButtons :: FileSelectionClass fsel => fsel ->-			   IO (Button, Button)+                           IO (Button, Button) fileSelectionGetButtons fsel =     do     ok <- butPtrToButton #{peek GtkFileSelection, ok_button}@@ -807,9 +826,9 @@ widgetGetSize :: WidgetClass widget => widget -> IO (Int, Int) widgetGetSize da = withForeignPtr (unWidget.toWidget $ da) $ \wPtr -> do     (width :: #{gtk2hs_type gint}) <- #{peek GtkAllocation, width}-			       (#{ptr GtkWidget, allocation} wPtr)+                               (#{ptr GtkWidget, allocation} wPtr)     (height :: #{gtk2hs_type gint}) <- #{peek GtkAllocation, height}-				(#{ptr GtkWidget, allocation} wPtr)+                                (#{ptr GtkWidget, allocation} wPtr)     return (fromIntegral width, fromIntegral height)  -- Window related methods@@ -1104,9 +1123,9 @@   sizeOf _ = #{const sizeof(GdkKeymapKey)}   alignment _ = alignment (undefined::#gtk2hs_type gint)   peek ptr = do-    (keycode_  ::#gtk2hs_type guint)	<- #{peek GdkKeymapKey, keycode} ptr-    (group_  ::#gtk2hs_type gint)	<- #{peek GdkKeymapKey, group} ptr-    (level_ ::#gtk2hs_type gint)	<- #{peek GdkKeymapKey, level} ptr+    (keycode_  ::#gtk2hs_type guint)    <- #{peek GdkKeymapKey, keycode} ptr+    (group_  ::#gtk2hs_type gint)       <- #{peek GdkKeymapKey, group} ptr+    (level_ ::#gtk2hs_type gint)        <- #{peek GdkKeymapKey, level} ptr     return $ KeymapKey (fromIntegral keycode_) (fromIntegral group_) (fromIntegral level_)   poke ptr (KeymapKey keycode group level) = do     #{poke GdkKeymapKey, keycode} ptr ((fromIntegral keycode)::#gtk2hs_type guint)

Graphics/UI/Gtk/General/Style.chs view

@@ -74,19 +74,19 @@ import System.Glib.FFI {#import Graphics.Rendering.Pango.Types#} import Graphics.Rendering.Pango.BasicTypes-import Graphics.UI.Gtk.General.Structs		(Rectangle)+import Graphics.UI.Gtk.General.Structs          (Rectangle) import Graphics.UI.Gtk.General.Enums (StateType, ShadowType) #endif  {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.General.Structs		(styleGetForeground,-			 styleGetBackground,-			 styleGetLight,-			 styleGetMiddle,-			 styleGetDark,-			 styleGetText,-			 styleGetBase,-			 styleGetAntiAliasing)+import Graphics.UI.Gtk.General.Structs          (styleGetForeground,+                         styleGetBackground,+                         styleGetLight,+                         styleGetMiddle,+                         styleGetDark,+                         styleGetText,+                         styleGetBase,+                         styleGetAntiAliasing)  #if GTK_MAJOR_VERSION < 3 stylePaintFlatBox :: WidgetClass widget

Graphics/UI/Gtk/Layout/Alignment.chs view

@@ -81,12 +81,12 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Layout/AspectFrame.chs view

@@ -65,13 +65,13 @@   aspectFrameObeyChild,   ) where -import Control.Monad	(liftM)-import Data.Maybe	(isNothing)+import Control.Monad    (liftM)+import Data.Maybe       (isNothing)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Layout/Fixed.chs view

@@ -96,11 +96,11 @@   fixedChildY,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} import Graphics.UI.Gtk.Abstract.ContainerChildProperties

Graphics/UI/Gtk/Layout/HBox.chs view

@@ -59,10 +59,10 @@   hBoxNew,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Layout/HPaned.chs view

@@ -53,10 +53,10 @@   hPanedNew,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Layout/Layout.chs view

@@ -80,13 +80,13 @@   afterSetScrollAdjustments,   ) where -import Data.Maybe	(fromMaybe)-import Control.Monad	(liftM)+import Data.Maybe       (fromMaybe)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} import Graphics.UI.Gtk.Abstract.ContainerChildProperties

Graphics/UI/Gtk/Layout/Notebook.chs view

@@ -188,18 +188,18 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} import Graphics.UI.Gtk.Abstract.ContainerChildProperties-import Graphics.UI.Gtk.Display.Label	(labelNew)-import Graphics.UI.Gtk.General.Enums	(Packing(..), toPacking, fromPacking,+import Graphics.UI.Gtk.Display.Label    (labelNew)+import Graphics.UI.Gtk.General.Enums    (Packing(..), toPacking, fromPacking,                                          PackType(..), PositionType(..))  {# context lib="gtk" prefix="gtk" #}@@ -1323,10 +1323,10 @@ onSwitchPage, afterSwitchPage :: NotebookClass nb => nb -> (Int -> IO ()) ->                                  IO (ConnectId nb) onSwitchPage nb fun = connect_BOXED_WORD__NONE "switch-page"-		      (const $ return ()) False nb-		      (\_ page -> fun (fromIntegral page))+                      (const $ return ()) False nb+                      (\_ page -> fun (fromIntegral page)) afterSwitchPage nb fun = connect_BOXED_WORD__NONE "switch-page"-			 (const $ return ()) True nb-			 (\_ page -> fun (fromIntegral page))+                         (const $ return ()) True nb+                         (\_ page -> fun (fromIntegral page))  #endif

Graphics/UI/Gtk/Layout/Table.chs view

@@ -103,15 +103,15 @@   tableChildYPadding,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import System.Glib.Flags		(fromFlags)+import System.Glib.Flags                (fromFlags) import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.General.Enums	(AttachOptions(..))+import Graphics.UI.Gtk.General.Enums    (AttachOptions(..)) import Graphics.UI.Gtk.Abstract.ContainerChildProperties  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Layout/VBox.chs view

@@ -59,10 +59,10 @@   vBoxNew,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Layout/VPaned.chs view

@@ -53,10 +53,10 @@   vPanedNew,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/MenuComboToolbar/CheckMenuItem.chs view

@@ -82,12 +82,12 @@   checkMenuItemToggled   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Signals#} {#import Graphics.UI.Gtk.Types#}

Graphics/UI/Gtk/MenuComboToolbar/Combo.chs view

@@ -94,19 +94,19 @@   ) where  #if GTK_MAJOR_VERSION < 3-import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object		(makeNewObject)-import Graphics.UI.Gtk.Abstract.Widget		(widgetShow)-import Graphics.UI.Gtk.Abstract.Container	(containerAdd)+import Graphics.UI.Gtk.Abstract.Object          (makeNewObject)+import Graphics.UI.Gtk.Abstract.Widget          (widgetShow)+import Graphics.UI.Gtk.Abstract.Container       (containerAdd) {#import Graphics.UI.Gtk.Types#}  #ifndef DISABLE_DEPRECATED-import Graphics.UI.Gtk.General.Structs		(comboGetList)+import Graphics.UI.Gtk.General.Structs          (comboGetList) #endif  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs view

@@ -93,12 +93,12 @@   ) where  #if GTK_MAJOR_VERSION < 3-import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} hiding ( ListStore ) import Graphics.UI.Gtk.ModelView.Types import Graphics.UI.Gtk.MenuComboToolbar.ComboBox

Graphics/UI/Gtk/MenuComboToolbar/ImageMenuItem.chs view

@@ -71,12 +71,12 @@   imageMenuItemImage,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} import Graphics.UI.Gtk.General.StockItems

@@ -114,7 +114,7 @@   menuChildBottomAttach,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM) import Data.Maybe  (fromMaybe)  import System.Glib.FFI@@ -122,7 +122,7 @@ import System.Glib.GList import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} import Graphics.UI.Gtk.Abstract.ContainerChildProperties import Graphics.UI.Gtk.Gdk.Events (MouseButton, TimeStamp)

Graphics/UI/Gtk/MenuComboToolbar/MenuBar.chs view

@@ -70,11 +70,11 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs view

@@ -127,12 +127,12 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/MenuComboToolbar/MenuShell.chs view

@@ -92,13 +92,13 @@   afterSelectionDone   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}-import Graphics.UI.Gtk.General.Enums	(MenuDirectionType(..))+import Graphics.UI.Gtk.General.Enums    (MenuDirectionType(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.chs view

@@ -82,12 +82,12 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} import Graphics.UI.Gtk.General.StockItems

Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs view

@@ -86,12 +86,12 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/MenuComboToolbar/RadioMenuItem.chs view

@@ -69,11 +69,11 @@   radioMenuItemNewJoinGroupWithMnemonic,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/MenuComboToolbar/RadioToolButton.chs view

@@ -76,13 +76,13 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.GList import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} import Graphics.UI.Gtk.General.StockItems

Graphics/UI/Gtk/MenuComboToolbar/SeparatorMenuItem.chs view

@@ -55,10 +55,10 @@   separatorMenuItemNew,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/MenuComboToolbar/SeparatorToolItem.chs view

@@ -71,11 +71,11 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/MenuComboToolbar/TearoffMenuItem.chs view

@@ -63,10 +63,10 @@   tearoffMenuItemNew,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/MenuComboToolbar/ToggleToolButton.chs view

@@ -76,12 +76,12 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} import Graphics.UI.Gtk.General.StockItems

Graphics/UI/Gtk/MenuComboToolbar/ToolButton.chs view

@@ -108,12 +108,12 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} import Graphics.UI.Gtk.General.StockItems

Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs view

@@ -105,17 +105,17 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) import Graphics.Rendering.Pango.Enums   (EllipsizeMode (..)) import Graphics.UI.Gtk.Misc.SizeGroup {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.General.Structs	(IconSize)-import Graphics.UI.Gtk.General.Enums	(Orientation(..), ToolbarStyle(..), ReliefStyle(..))+import Graphics.UI.Gtk.General.Structs  (IconSize)+import Graphics.UI.Gtk.General.Enums    (Orientation(..), ToolbarStyle(..), ReliefStyle(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/MenuComboToolbar/ToolItemGroup.chs view

@@ -77,15 +77,15 @@ #endif ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties import System.Glib.UTFString import Graphics.Rendering.Pango.Enums   (EllipsizeMode (..))-import Graphics.UI.Gtk.General.Enums	(ReliefStyle(..))-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.General.Enums    (ReliefStyle(..))+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/MenuComboToolbar/ToolPalette.chs view

@@ -98,14 +98,14 @@ #endif ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties import Graphics.UI.Gtk.General.Structs (IconSize (..)) import Graphics.UI.Gtk.General.Enums (ToolbarStyle (..))-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

@@ -161,33 +161,33 @@   afterPopupContextMenu,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM) #if GTK_MAJOR_VERSION < 3 #ifndef DISABLE_DEPRECATED-import Data.Maybe	(fromJust)+import Data.Maybe       (fromJust) import qualified Data.Text as T (filter) import Graphics.UI.Gtk.General.StockItems-import Graphics.UI.Gtk.Display.Image	(imageNewFromStock)+import Graphics.UI.Gtk.Display.Image    (imageNewFromStock) import System.Glib.UTFString #endif #endif import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} import Graphics.UI.Gtk.Abstract.ContainerChildProperties-import Graphics.UI.Gtk.General.Enums	(Orientation(..), ToolbarStyle(..),-					 ReliefStyle(..))-import Graphics.UI.Gtk.General.Structs	(+import Graphics.UI.Gtk.General.Enums    (Orientation(..), ToolbarStyle(..),+                                         ReliefStyle(..))+import Graphics.UI.Gtk.General.Structs  ( #if GTK_MAJOR_VERSION < 3 #ifndef DISABLE_DEPRECATED-					 toolbarChildToggleButton,-					 toolbarChildRadioButton,+                                         toolbarChildToggleButton,+                                         toolbarChildRadioButton, #endif #endif-					 IconSize(..))+                                         IconSize(..))  {# context lib="gtk" prefix="gtk" #} @@ -294,7 +294,7 @@   mItem <- stockLookupItem stockId   item <- case mItem of     (Just item) -> return item-    Nothing	-> liftM fromJust $ stockLookupItem stockMissingImage+    Nothing     -> liftM fromJust $ stockLookupItem stockMissingImage   let label = (T.filter (/= '_')) $ siLabel item   size <- toolbarGetIconSize (toToolbar self)   image <- imageNewFromStock stockId size@@ -358,7 +358,7 @@   mItem <- stockLookupItem stockId   item <- case mItem of     (Just item) -> return item-    Nothing	-> liftM fromJust $ stockLookupItem stockMissingImage+    Nothing     -> liftM fromJust $ stockLookupItem stockMissingImage   let label = (T.filter (/= '_')) $ siLabel item   size <- toolbarGetIconSize (toToolbar self)   image <- imageNewFromStock stockId size

Graphics/UI/Gtk/Misc/Accessible.chs view

@@ -55,7 +55,7 @@ #if GTK_CHECK_VERSION(2,22,0)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Misc/Adjustment.chs view

@@ -93,12 +93,12 @@   afterValueChanged,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Misc/Arrow.chs view

@@ -70,14 +70,14 @@   arrowShadowType,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.General.Enums	(ArrowType(..), ShadowType(..))+import Graphics.UI.Gtk.General.Enums    (ArrowType(..), ShadowType(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Misc/Calendar.chs view

@@ -115,16 +115,16 @@   afterPrevYear,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import System.Glib.Flags		(fromFlags, toFlags)+import System.Glib.Flags                (fromFlags, toFlags) import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}-import Graphics.UI.Gtk.General.Enums	(CalendarDisplayOptions(..))+import Graphics.UI.Gtk.General.Enums    (CalendarDisplayOptions(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Misc/DrawingArea.chs view

@@ -86,13 +86,13 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} #if GTK_MAJOR_VERSION < 3-import Graphics.UI.Gtk.General.Structs	(widgetGetDrawWindow, widgetGetSize)+import Graphics.UI.Gtk.General.Structs  (widgetGetDrawWindow, widgetGetSize) #endif  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Misc/EventBox.chs view

@@ -66,11 +66,11 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Misc/HandleBox.chs view

@@ -91,15 +91,15 @@   afterChildDetached,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}-import Graphics.UI.Gtk.General.Enums	(ShadowType(..), PositionType(..))+import Graphics.UI.Gtk.General.Enums    (ShadowType(..), PositionType(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Misc/IMContextSimple.chs view

@@ -49,7 +49,7 @@   imContextSimpleAddTable,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM) import Data.Map (Map)  import System.Glib.FFI

Graphics/UI/Gtk/Misc/SizeGroup.chs view

@@ -87,7 +87,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes

Graphics/UI/Gtk/Misc/Tooltip.chs view

@@ -105,7 +105,7 @@  import System.Glib.FFI import System.Glib.UTFString-import Graphics.UI.Gtk.General.Structs	(IconSize(..), Rectangle)+import Graphics.UI.Gtk.General.Structs  (IconSize(..), Rectangle) {#import Graphics.UI.Gtk.Types#} #ifdef HAVE_GIO {#import System.GIO.Types#}

Graphics/UI/Gtk/Misc/Viewport.chs view

@@ -81,13 +81,13 @@   viewportShadowType,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.General.Enums	(ShadowType(..))+import Graphics.UI.Gtk.General.Enums    (ShadowType(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/ModelView/CellLayout.chs view

@@ -199,9 +199,9 @@ -- pass the child model to this function. -- cellLayoutSetAttributes :: (CellLayoutClass self,-			     CellRendererClass cell,-			     TreeModelClass (model row),-			     TypedTreeModelClass model)+                             CellRendererClass cell,+                             TreeModelClass (model row),+                             TypedTreeModelClass model)  => self  -> cell   -- ^ @cell@ - A 'CellRenderer'.  -> model row -- ^ @model@ - A model containing rows of type @row@.@@ -216,8 +216,8 @@ -- attributes of the 'CellRenderer' @cell@ using the row's content. -- cellLayoutSetAttributeFunc :: (CellLayoutClass self,-			       CellRendererClass cell,-			       TreeModelClass model)+                               CellRendererClass cell,+                               TreeModelClass model)  => self  -> cell   -- ^ @cell@ - A 'CellRenderer'.  -> model  -- ^ @model@ - A model from which to draw data.@@ -230,7 +230,7 @@     let (CellRenderer cellPtr) = toCellRenderer cell     if unsafeForeignPtrToPtr cellPtr  /= cellPtr' then       error ("cellLayoutSetAttributeFunc: attempt to set attributes of "++-	     "a different CellRenderer.")+             "a different CellRenderer.")       else func iter   {#call gtk_cell_layout_set_cell_data_func #} (toCellLayout self)     (toCellRenderer cell) fPtr (castFunPtrToPtr fPtr) destroyFunPtr

Graphics/UI/Gtk/ModelView/CellRenderer.chs view

@@ -27,7 +27,7 @@ -- module Graphics.UI.Gtk.ModelView.CellRenderer ( -- * Detail---	+--       -- | The 'CellRenderer' is a base class of a set of objects used for rendering -- a cell to a 'Drawable'. These objects are used primarily by the 'TreeView' -- widget, though they aren't tied to them in any specific way. It is worth@@ -119,7 +119,7 @@ import System.Glib.Properties {#import Graphics.UI.Gtk.Types#} #if GTK_MAJOR_VERSION < 3-import Graphics.UI.Gtk.Gdk.GC		(Color)+import Graphics.UI.Gtk.Gdk.GC           (Color) #endif {#import Graphics.UI.Gtk.Signals#} {#import Graphics.UI.Gtk.ModelView.Types#}@@ -146,7 +146,7 @@ #endif  -- %hash c:6d51 d:dc3e--- | Returns	@(width, height)@	denoting the size of the fixed size of+-- | Returns    @(width, height)@       denoting the size of the fixed size of -- @cell@. If no fixed size is set, returns @-1@ for that value. -- cellRendererGetFixedSize :: CellRendererClass self => self@@ -325,7 +325,7 @@ -- * Available since Gtk+ version 2.6 -- editingStarted :: CellRendererClass self =>-		  Signal self (Widget -> TreePath -> IO ())+                  Signal self (Widget -> TreePath -> IO ()) editingStarted = Signal editingStartedInternal  editingStartedInternal after cr act =

Graphics/UI/Gtk/ModelView/CellRendererAccel.chs view

@@ -73,7 +73,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString

Graphics/UI/Gtk/ModelView/CellRendererPixbuf.chs view

@@ -72,13 +72,13 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes                   (Attr) import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object		(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object          (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/ModelView/CellRendererProgress.chs view

@@ -59,13 +59,13 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString-import System.Glib.Attributes			(Attr)+import System.Glib.Attributes                   (Attr) import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object		(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object          (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/ModelView/CellRendererSpin.chs view

@@ -73,7 +73,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes

Graphics/UI/Gtk/ModelView/CellRendererSpinner.chs view

@@ -64,13 +64,13 @@ #endif ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties import Graphics.UI.Gtk.Abstract.Object   (makeNewObject)-import Graphics.UI.Gtk.General.Structs	(IconSize(..))+import Graphics.UI.Gtk.General.Structs  (IconSize(..)) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/ModelView/CellRendererText.chs view

@@ -118,21 +118,21 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Properties import System.Glib.Attributes (Attr, WriteAttr)-import Graphics.UI.Gtk.Abstract.Object		(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object          (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} {#import Graphics.UI.Gtk.ModelView.Types#}-import Graphics.UI.Gtk.General.Structs		()+import Graphics.UI.Gtk.General.Structs          () import Graphics.Rendering.Pango.Enums {#import Graphics.Rendering.Pango.BasicTypes#} ( FontDescription(..),-					 makeNewFontDescription )-{#import Graphics.Rendering.Pango.Layout#}	( LayoutAlignment, LayoutWrapMode )+                                         makeNewFontDescription )+{#import Graphics.Rendering.Pango.Layout#}      ( LayoutAlignment, LayoutWrapMode )  {# context lib="gtk" prefix="gtk" #} @@ -213,7 +213,7 @@ -- cellTextEllipsize :: CellRendererTextClass self => Attr self EllipsizeMode cellTextEllipsize = newAttrFromEnumProperty "ellipsize"-		{# call pure pango_ellipsize_mode_get_type #}+                {# call pure pango_ellipsize_mode_get_type #}  -- | Whether the 'cellTextEllipsize' tag affects the ellipsize mode. --@@ -340,7 +340,7 @@ -- cellTextStretch :: CellRendererTextClass self => Attr self Stretch cellTextStretch = newAttrFromEnumProperty "stretch"-	      {# call pure pango_stretch_get_type #}+              {# call pure pango_stretch_get_type #}  -- | Whether the 'cellTextStretch' tag is used, default is @False@. --@@ -361,7 +361,7 @@ -- cellTextStyle :: CellRendererTextClass self => Attr self FontStyle cellTextStyle = newAttrFromEnumProperty "style"-	    {# call pure pango_style_get_type #}+            {# call pure pango_style_get_type #}  -- | Whether the 'cellTextStyle' tag is used, default is @False@. --@@ -378,7 +378,7 @@ -- cellTextUnderline :: CellRendererTextClass self => Attr self Underline cellTextUnderline = newAttrFromEnumProperty "underline"-		{# call pure pango_underline_get_type #}+                {# call pure pango_underline_get_type #}  -- | Whether the 'cellTextUnderline' tag is used, default is @False@. --@@ -389,7 +389,7 @@ -- cellTextVariant :: CellRendererTextClass self => Attr self Variant cellTextVariant = newAttrFromEnumProperty "variant"-	      {# call pure pango_variant_get_type #}+              {# call pure pango_variant_get_type #}  -- | Whether the 'cellTextVariant' tag is used, default is @False@. --@@ -430,7 +430,7 @@ -- cellTextWrapMode :: CellRendererTextClass self => Attr self LayoutWrapMode cellTextWrapMode = newAttrFromEnumProperty "wrap-mode"-	       {# call pure pango_wrap_mode_get_type #}+               {# call pure pango_wrap_mode_get_type #}  -- | Specifies the width at which the text is wrapped. The wrap-mode --   property can be used to influence at what character positions the@@ -478,7 +478,7 @@ --   'cellTextEditable') or when the user aborts editing. -- edited :: (CellRendererTextClass self, GlibString string) =>-	  Signal self (TreePath -> string -> IO ())+          Signal self (TreePath -> string -> IO ()) edited = Signal internalEdited  --------------------@@ -501,7 +501,7 @@ #endif  internalEdited :: (CellRendererTextClass cr, GlibString string) =>-		  Bool -> cr ->+                  Bool -> cr ->                   (TreePath -> string -> IO ()) ->                   IO (ConnectId cr) internalEdited after cr user =

Graphics/UI/Gtk/ModelView/CellRendererToggle.chs view

@@ -73,14 +73,14 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes                   (Attr)-import System.Glib.Properties			(newAttrFromBoolProperty,-						 newAttrFromIntProperty)-import Graphics.UI.Gtk.Abstract.Object		(makeNewObject)+import System.Glib.Properties                   (newAttrFromBoolProperty,+                                                 newAttrFromIntProperty)+import Graphics.UI.Gtk.Abstract.Object          (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/ModelView/CellView.chs view

@@ -69,18 +69,18 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM) import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes-import System.Glib.Properties			(writeAttrFromStringProperty)+import System.Glib.Properties                   (writeAttrFromStringProperty) #if GTK_MAJOR_VERSION < 3 {#import System.Glib.GList#} #endif {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.Abstract.Object		(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object          (makeNewObject) {#import Graphics.UI.Gtk.ModelView.Types#}-import Graphics.UI.Gtk.General.Structs		(Color, Requisition)+import Graphics.UI.Gtk.General.Structs          (Color, Requisition)  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/ModelView/CustomStore.chs view

@@ -50,21 +50,21 @@   treeModelSetColumn,   ) where -import Control.Monad	                        (liftM)+import Control.Monad                            (liftM) import Control.Monad.Reader                     (runReaderT) import Data.IORef                               (IORef, newIORef, readIORef, writeIORef) import Data.Maybe                               (fromMaybe)-import System.Glib.FFI			hiding	(maybeNull)-import System.Glib.Flags			(Flags, fromFlags)+import System.Glib.FFI                  hiding  (maybeNull)+import System.Glib.Flags                        (Flags, fromFlags) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.ModelView.Types#} import Graphics.UI.Gtk.General.DNDTypes         (SelectionDataM, SelectionData) -{#import System.Glib.GValue#}			(GValue(GValue))-{#import System.Glib.GType#}			(GType)+{#import System.Glib.GValue#}                   (GValue(GValue))+{#import System.Glib.GType#}                    (GType) import qualified System.Glib.GTypeConstants as GConst {#import System.Glib.GValueTypes#}-{#import System.Glib.GValue#}			(valueInit)+{#import System.Glib.GValue#}                   (valueInit)  {# context lib="gtk" prefix="gtk" #} @@ -109,10 +109,10 @@ --   the model is installed into a widget since the number of defined --   columns are only checked once by widgets. customStoreSetColumn :: TypedTreeModelClass model-	=> model row -- ^ the store in which to allocate a new column-	-> (ColumnId row ty) -- ^ the column that should be set-	-> (row -> ty) -- ^ the function that sets the property-	-> IO ()+        => model row -- ^ the store in which to allocate a new column+        -> (ColumnId row ty) -- ^ the column that should be set+        -> (row -> ty) -- ^ the function that sets the property+        -> IO () customStoreSetColumn model (ColumnId _ setter colId) acc | colId<0 = return ()                                                          | otherwise =   case toTypedTreeModel model of@@ -131,14 +131,14 @@  -- this is a backwards compatability definition treeModelSetColumn :: TypedTreeModelClass model-	=> model row -- ^ the store in which to allocate a new column-	-> (ColumnId row ty) -- ^ the column that should be set-	-> (row -> ty) -- ^ the function that sets the property-	-> IO ()+        => model row -- ^ the store in which to allocate a new column+        -> (ColumnId row ty) -- ^ the column that should be set+        -> (row -> ty) -- ^ the function that sets the property+        -> IO () treeModelSetColumn = customStoreSetColumn  data CustomStoreImplementation model row = CustomStoreImplementation {-    customStoreColumns          :: ColumnMap row,	                -- provide access via columns+    customStoreColumns          :: ColumnMap row,                       -- provide access via columns     customStoreIface            :: TreeModelIface row,            -- functions implementing a tree model     customTreeDragSourceIface   :: DragSourceIface model row,     -- the drag and drop source interface     customTreeDragDestIface     :: DragDestIface model row        -- the drag and drop dest interface@@ -371,7 +371,7 @@       (CABool ca) -> valueInit gVal GConst.bool >> valueSetBool gVal (ca row)       (CAString ca) -> valueInit gVal GConst.string >> valueSetString gVal (ca row)       (CAPixbuf ca) -> valueInit gVal {#call fun unsafe gdk_pixbuf_get_type#} >>-			valueSetGObject gVal (ca row)+                        valueSetGObject gVal (ca row)       CAInvalid -> valueInit gVal GConst.int >> valueSetInt gVal 0  foreign export ccall "gtk2hs_store_get_value_impl"

Graphics/UI/Gtk/ModelView/ListStore.hs view

@@ -288,8 +288,8 @@   let loop (-1) Seq.EmptyR = return ()       loop n (seq Seq.:> _) = do         writeIORef (customStoreGetPrivate model) seq-	treeModelRowDeleted model [n]-	loop (n-1) (Seq.viewr seq)+        treeModelRowDeleted model [n]+        loop (n-1) (Seq.viewr seq)     in do seq <- readIORef (customStoreGetPrivate model)          loop (Seq.length seq - 1) (Seq.viewr seq)

Graphics/UI/Gtk/ModelView/Sequence.hs view

@@ -23,59 +23,59 @@ -- as described in section 4.2 of -- --    * Ralf Hinze and Ross Paterson,---	\"Finger trees: a simple general-purpose data structure\",---	submitted to /Journal of Functional Programming/.---	<http://www.soi.city.ac.uk/~ross/papers/FingerTree.html>+--      \"Finger trees: a simple general-purpose data structure\",+--      submitted to /Journal of Functional Programming/.+--      <http://www.soi.city.ac.uk/~ross/papers/FingerTree.html> -- -----------------------------------------------------------------------------  module Graphics.UI.Gtk.ModelView.Sequence (-	Seq,-	-- * Construction-	empty,		-- :: Seq a-	singleton,	-- :: a -> Seq a-	(<|),		-- :: a -> Seq a -> Seq a-	(|>),		-- :: Seq a -> a -> Seq a-	(><),		-- :: Seq a -> Seq a -> Seq a-	-- * Deconstruction-	null,		-- :: Seq a -> Bool-	-- ** Views-	ViewL(..),-	viewl,		-- :: Seq a -> ViewL a-	ViewR(..),-	viewr,		-- :: Seq a -> ViewR a-	-- ** Indexing-	length,		-- :: Seq a -> Int-	index,		-- :: Seq a -> Int -> a-	adjust,		-- :: (a -> a) -> Int -> Seq a -> Seq a-	update,		-- :: Int -> a -> Seq a -> Seq a-	take,		-- :: Int -> Seq a -> Seq a-	drop,		-- :: Int -> Seq a -> Seq a-	splitAt,	-- :: Int -> Seq a -> (Seq a, Seq a)-	-- * Lists-	fromList,	-- :: [a] -> Seq a-	toList,		-- :: Seq a -> [a]-	-- * Folds-	-- ** Right associative-	foldr,		-- :: (a -> b -> b) -> b -> Seq a -> b-	foldr1,		-- :: (a -> a -> a) -> Seq a -> a-	foldr',		-- :: (a -> b -> b) -> b -> Seq a -> b-	foldrM,		-- :: Monad m => (a -> b -> m b) -> b -> Seq a -> m b-	-- ** Left associative-	foldl,		-- :: (a -> b -> a) -> a -> Seq b -> a-	foldl1,		-- :: (a -> a -> a) -> Seq a -> a-	foldl',		-- :: (a -> b -> a) -> a -> Seq b -> a-	foldlM,		-- :: Monad m => (a -> b -> m a) -> a -> Seq b -> m a-	-- * Transformations-	reverse,	-- :: Seq a -> Seq a+        Seq,+        -- * Construction+        empty,          -- :: Seq a+        singleton,      -- :: a -> Seq a+        (<|),           -- :: a -> Seq a -> Seq a+        (|>),           -- :: Seq a -> a -> Seq a+        (><),           -- :: Seq a -> Seq a -> Seq a+        -- * Deconstruction+        null,           -- :: Seq a -> Bool+        -- ** Views+        ViewL(..),+        viewl,          -- :: Seq a -> ViewL a+        ViewR(..),+        viewr,          -- :: Seq a -> ViewR a+        -- ** Indexing+        length,         -- :: Seq a -> Int+        index,          -- :: Seq a -> Int -> a+        adjust,         -- :: (a -> a) -> Int -> Seq a -> Seq a+        update,         -- :: Int -> a -> Seq a -> Seq a+        take,           -- :: Int -> Seq a -> Seq a+        drop,           -- :: Int -> Seq a -> Seq a+        splitAt,        -- :: Int -> Seq a -> (Seq a, Seq a)+        -- * Lists+        fromList,       -- :: [a] -> Seq a+        toList,         -- :: Seq a -> [a]+        -- * Folds+        -- ** Right associative+        foldr,          -- :: (a -> b -> b) -> b -> Seq a -> b+        foldr1,         -- :: (a -> a -> a) -> Seq a -> a+        foldr',         -- :: (a -> b -> b) -> b -> Seq a -> b+        foldrM,         -- :: Monad m => (a -> b -> m b) -> b -> Seq a -> m b+        -- ** Left associative+        foldl,          -- :: (a -> b -> a) -> a -> Seq b -> a+        foldl1,         -- :: (a -> a -> a) -> Seq a -> a+        foldl',         -- :: (a -> b -> a) -> a -> Seq b -> a+        foldlM,         -- :: Monad m => (a -> b -> m a) -> a -> Seq b -> m a+        -- * Transformations+        reverse,        -- :: Seq a -> Seq a #if TESTING-	valid,+        valid, #endif-	) where+        ) where  import Prelude hiding (-	null, length, take, drop, splitAt, foldl, foldl1, foldr, foldr1,-	reverse)+        null, length, take, drop, splitAt, foldl, foldl1, foldr, foldr1,+        reverse) import qualified Prelude (foldr) import Data.List (intersperse) import qualified Data.List (foldl')@@ -93,7 +93,7 @@ infixl 5 |>, :>  class Sized a where-	size :: a -> Int+        size :: a -> Int  ------------------------------------------------------------------------ -- Random access sequences@@ -103,73 +103,73 @@ newtype Seq a = Seq (FingerTree (Elem a))  instance Functor Seq where-	fmap f (Seq xs) = Seq (fmap (fmap f) xs)+        fmap f (Seq xs) = Seq (fmap (fmap f) xs)  instance Eq a => Eq (Seq a) where-	xs == ys = length xs == length ys && toList xs == toList ys+        xs == ys = length xs == length ys && toList xs == toList ys  instance Ord a => Ord (Seq a) where-	compare xs ys = compare (toList xs) (toList ys)+        compare xs ys = compare (toList xs) (toList ys)  #if TESTING instance (Show a) => Show (Seq a) where-	showsPrec p (Seq x) = showsPrec p x+        showsPrec p (Seq x) = showsPrec p x #else instance Show a => Show (Seq a) where-	showsPrec _ xs = showChar '<' .-		flip (Prelude.foldr ($)) (intersperse (showChar ',')-						(map shows (toList xs))) .-		showChar '>'+        showsPrec _ xs = showChar '<' .+                flip (Prelude.foldr ($)) (intersperse (showChar ',')+                                                (map shows (toList xs))) .+                showChar '>' #endif  -- Finger trees  data FingerTree a-	= Empty-	| Single a-	| Deep {-# UNPACK #-} !Int !(Digit a) (FingerTree (Node a)) !(Digit a)+        = Empty+        | Single a+        | Deep {-# UNPACK #-} !Int !(Digit a) (FingerTree (Node a)) !(Digit a) #if TESTING-	deriving Show+        deriving Show #endif  instance Sized a => Sized (FingerTree a) where-	size Empty		= 0-	size (Single x)		= size x-	size (Deep v _ _ _)	= v+        size Empty              = 0+        size (Single x)         = size x+        size (Deep v _ _ _)     = v  instance Functor FingerTree where-	fmap _ Empty = Empty-	fmap f (Single x) = Single (f x)-	fmap f (Deep v pr m sf) =-		Deep v (fmap f pr) (fmap (fmap f) m) (fmap f sf)+        fmap _ Empty = Empty+        fmap f (Single x) = Single (f x)+        fmap f (Deep v pr m sf) =+                Deep v (fmap f pr) (fmap (fmap f) m) (fmap f sf)  {-# INLINE deep #-}-deep		:: Sized a => Digit a -> FingerTree (Node a) -> Digit a -> FingerTree a-deep pr m sf	=  Deep (size pr + size m + size sf) pr m sf+deep            :: Sized a => Digit a -> FingerTree (Node a) -> Digit a -> FingerTree a+deep pr m sf    =  Deep (size pr + size m + size sf) pr m sf  -- Digits  data Digit a-	= One a-	| Two a a-	| Three a a a-	| Four a a a a+        = One a+        | Two a a+        | Three a a a+        | Four a a a a #if TESTING-	deriving Show+        deriving Show #endif  instance Functor Digit where-	fmap f (One a) = One (f a)-	fmap f (Two a b) = Two (f a) (f b)-	fmap f (Three a b c) = Three (f a) (f b) (f c)-	fmap f (Four a b c d) = Four (f a) (f b) (f c) (f d)+        fmap f (One a) = One (f a)+        fmap f (Two a b) = Two (f a) (f b)+        fmap f (Three a b c) = Three (f a) (f b) (f c)+        fmap f (Four a b c d) = Four (f a) (f b) (f c) (f d)  instance Sized a => Sized (Digit a) where-	size xs = foldlDigit (\ i x -> i + size x) 0 xs+        size xs = foldlDigit (\ i x -> i + size x) 0 xs  {-# SPECIALIZE digitToTree :: Digit (Elem a) -> FingerTree (Elem a) #-} {-# SPECIALIZE digitToTree :: Digit (Node a) -> FingerTree (Node a) #-}-digitToTree	:: Sized a => Digit a -> FingerTree a+digitToTree     :: Sized a => Digit a -> FingerTree a digitToTree (One a) = Single a digitToTree (Two a b) = deep (One a) Empty (One b) digitToTree (Three a b c) = deep (Two a b) Empty (One c)@@ -178,27 +178,27 @@ -- Nodes  data Node a-	= Node2 {-# UNPACK #-} !Int a a-	| Node3 {-# UNPACK #-} !Int a a a+        = Node2 {-# UNPACK #-} !Int a a+        | Node3 {-# UNPACK #-} !Int a a a #if TESTING-	deriving Show+        deriving Show #endif  instance Functor (Node) where-	fmap f (Node2 v a b) = Node2 v (f a) (f b)-	fmap f (Node3 v a b c) = Node3 v (f a) (f b) (f c)+        fmap f (Node2 v a b) = Node2 v (f a) (f b)+        fmap f (Node3 v a b c) = Node3 v (f a) (f b) (f c)  instance Sized (Node a) where-	size (Node2 v _ _)	= v-	size (Node3 v _ _ _)	= v+        size (Node2 v _ _)      = v+        size (Node3 v _ _ _)    = v  {-# INLINE node2 #-}-node2		:: Sized a => a -> a -> Node a-node2 a b	=  Node2 (size a + size b) a b+node2           :: Sized a => a -> a -> Node a+node2 a b       =  Node2 (size a + size b) a b  {-# INLINE node3 #-}-node3		:: Sized a => a -> a -> a -> Node a-node3 a b c	=  Node3 (size a + size b + size c) a b c+node3           :: Sized a => a -> a -> a -> Node a+node3 a b c     =  Node3 (size a + size b + size c) a b c  nodeToDigit :: Node a -> Digit a nodeToDigit (Node2 _ a b) = Two a b@@ -209,14 +209,14 @@ newtype Elem a  =  Elem { getElem :: a }  instance Sized (Elem a) where-	size _ = 1+        size _ = 1  instance Functor Elem where-	fmap f (Elem x) = Elem (f x)+        fmap f (Elem x) = Elem (f x)  #ifdef TESTING instance (Show a) => Show (Elem a) where-	showsPrec p (Elem x) = showsPrec p x+        showsPrec p (Elem x) = showsPrec p x #endif  ------------------------------------------------------------------------@@ -224,298 +224,298 @@ ------------------------------------------------------------------------  -- | /O(1)/. The empty sequence.-empty		:: Seq a-empty		=  Seq Empty+empty           :: Seq a+empty           =  Seq Empty  -- | /O(1)/. A singleton sequence.-singleton	:: a -> Seq a-singleton x	=  Seq (Single (Elem x))+singleton       :: a -> Seq a+singleton x     =  Seq (Single (Elem x))  -- | /O(1)/. Add an element to the left end of a sequence. -- Mnemonic: a triangle with the single element at the pointy end.-(<|)		:: a -> Seq a -> Seq a-x <| Seq xs	=  Seq (Elem x `consTree` xs)+(<|)            :: a -> Seq a -> Seq a+x <| Seq xs     =  Seq (Elem x `consTree` xs)  {-# SPECIALIZE consTree :: Elem a -> FingerTree (Elem a) -> FingerTree (Elem a) #-} {-# SPECIALIZE consTree :: Node a -> FingerTree (Node a) -> FingerTree (Node a) #-}-consTree	:: Sized a => a -> FingerTree a -> FingerTree a-consTree a Empty	= Single a-consTree a (Single b)	= deep (One a) Empty (One b)+consTree        :: Sized a => a -> FingerTree a -> FingerTree a+consTree a Empty        = Single a+consTree a (Single b)   = deep (One a) Empty (One b) consTree a (Deep s (Four b c d e) m sf) = m `seq`-	Deep (size a + s) (Two a b) (node3 c d e `consTree` m) sf+        Deep (size a + s) (Two a b) (node3 c d e `consTree` m) sf consTree a (Deep s (Three b c d) m sf) =-	Deep (size a + s) (Four a b c d) m sf+        Deep (size a + s) (Four a b c d) m sf consTree a (Deep s (Two b c) m sf) =-	Deep (size a + s) (Three a b c) m sf+        Deep (size a + s) (Three a b c) m sf consTree a (Deep s (One b) m sf) =-	Deep (size a + s) (Two a b) m sf+        Deep (size a + s) (Two a b) m sf  -- | /O(1)/. Add an element to the right end of a sequence. -- Mnemonic: a triangle with the single element at the pointy end.-(|>)		:: Seq a -> a -> Seq a-Seq xs |> x	=  Seq (xs `snocTree` Elem x)+(|>)            :: Seq a -> a -> Seq a+Seq xs |> x     =  Seq (xs `snocTree` Elem x)  {-# SPECIALIZE snocTree :: FingerTree (Elem a) -> Elem a -> FingerTree (Elem a) #-} {-# SPECIALIZE snocTree :: FingerTree (Node a) -> Node a -> FingerTree (Node a) #-}-snocTree	:: Sized a => FingerTree a -> a -> FingerTree a-snocTree Empty a	=  Single a-snocTree (Single a) b	=  deep (One a) Empty (One b)+snocTree        :: Sized a => FingerTree a -> a -> FingerTree a+snocTree Empty a        =  Single a+snocTree (Single a) b   =  deep (One a) Empty (One b) snocTree (Deep s pr m (Four a b c d)) e = m `seq`-	Deep (s + size e) pr (m `snocTree` node3 a b c) (Two d e)+        Deep (s + size e) pr (m `snocTree` node3 a b c) (Two d e) snocTree (Deep s pr m (Three a b c)) d =-	Deep (s + size d) pr m (Four a b c d)+        Deep (s + size d) pr m (Four a b c d) snocTree (Deep s pr m (Two a b)) c =-	Deep (s + size c) pr m (Three a b c)+        Deep (s + size c) pr m (Three a b c) snocTree (Deep s pr m (One a)) b =-	Deep (s + size b) pr m (Two a b)+        Deep (s + size b) pr m (Two a b)  -- | /O(log(min(n1,n2)))/. Concatenate two sequences.-(><)		:: Seq a -> Seq a -> Seq a+(><)            :: Seq a -> Seq a -> Seq a Seq xs >< Seq ys = Seq (appendTree0 xs ys)  -- The appendTree/addDigits gunk below is machine generated  appendTree0 :: FingerTree (Elem a) -> FingerTree (Elem a) -> FingerTree (Elem a) appendTree0 Empty xs =-	xs+        xs appendTree0 xs Empty =-	xs+        xs appendTree0 (Single x) xs =-	x `consTree` xs+        x `consTree` xs appendTree0 xs (Single x) =-	xs `snocTree` x+        xs `snocTree` x appendTree0 (Deep s1 pr1 m1 sf1) (Deep s2 pr2 m2 sf2) =-	Deep (s1 + s2) pr1 (addDigits0 m1 sf1 pr2 m2) sf2+        Deep (s1 + s2) pr1 (addDigits0 m1 sf1 pr2 m2) sf2  addDigits0 :: FingerTree (Node (Elem a)) -> Digit (Elem a) -> Digit (Elem a) -> FingerTree (Node (Elem a)) -> FingerTree (Node (Elem a)) addDigits0 m1 (One a) (One b) m2 =-	appendTree1 m1 (node2 a b) m2+        appendTree1 m1 (node2 a b) m2 addDigits0 m1 (One a) (Two b c) m2 =-	appendTree1 m1 (node3 a b c) m2+        appendTree1 m1 (node3 a b c) m2 addDigits0 m1 (One a) (Three b c d) m2 =-	appendTree2 m1 (node2 a b) (node2 c d) m2+        appendTree2 m1 (node2 a b) (node2 c d) m2 addDigits0 m1 (One a) (Four b c d e) m2 =-	appendTree2 m1 (node3 a b c) (node2 d e) m2+        appendTree2 m1 (node3 a b c) (node2 d e) m2 addDigits0 m1 (Two a b) (One c) m2 =-	appendTree1 m1 (node3 a b c) m2+        appendTree1 m1 (node3 a b c) m2 addDigits0 m1 (Two a b) (Two c d) m2 =-	appendTree2 m1 (node2 a b) (node2 c d) m2+        appendTree2 m1 (node2 a b) (node2 c d) m2 addDigits0 m1 (Two a b) (Three c d e) m2 =-	appendTree2 m1 (node3 a b c) (node2 d e) m2+        appendTree2 m1 (node3 a b c) (node2 d e) m2 addDigits0 m1 (Two a b) (Four c d e f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits0 m1 (Three a b c) (One d) m2 =-	appendTree2 m1 (node2 a b) (node2 c d) m2+        appendTree2 m1 (node2 a b) (node2 c d) m2 addDigits0 m1 (Three a b c) (Two d e) m2 =-	appendTree2 m1 (node3 a b c) (node2 d e) m2+        appendTree2 m1 (node3 a b c) (node2 d e) m2 addDigits0 m1 (Three a b c) (Three d e f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits0 m1 (Three a b c) (Four d e f g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits0 m1 (Four a b c d) (One e) m2 =-	appendTree2 m1 (node3 a b c) (node2 d e) m2+        appendTree2 m1 (node3 a b c) (node2 d e) m2 addDigits0 m1 (Four a b c d) (Two e f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits0 m1 (Four a b c d) (Three e f g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits0 m1 (Four a b c d) (Four e f g h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2  appendTree1 :: FingerTree (Node a) -> Node a -> FingerTree (Node a) -> FingerTree (Node a) appendTree1 Empty a xs =-	a `consTree` xs+        a `consTree` xs appendTree1 xs a Empty =-	xs `snocTree` a+        xs `snocTree` a appendTree1 (Single x) a xs =-	x `consTree` a `consTree` xs+        x `consTree` a `consTree` xs appendTree1 xs a (Single x) =-	xs `snocTree` a `snocTree` x+        xs `snocTree` a `snocTree` x appendTree1 (Deep s1 pr1 m1 sf1) a (Deep s2 pr2 m2 sf2) =-	Deep (s1 + size a + s2) pr1 (addDigits1 m1 sf1 a pr2 m2) sf2+        Deep (s1 + size a + s2) pr1 (addDigits1 m1 sf1 a pr2 m2) sf2  addDigits1 :: FingerTree (Node (Node a)) -> Digit (Node a) -> Node a -> Digit (Node a) -> FingerTree (Node (Node a)) -> FingerTree (Node (Node a)) addDigits1 m1 (One a) b (One c) m2 =-	appendTree1 m1 (node3 a b c) m2+        appendTree1 m1 (node3 a b c) m2 addDigits1 m1 (One a) b (Two c d) m2 =-	appendTree2 m1 (node2 a b) (node2 c d) m2+        appendTree2 m1 (node2 a b) (node2 c d) m2 addDigits1 m1 (One a) b (Three c d e) m2 =-	appendTree2 m1 (node3 a b c) (node2 d e) m2+        appendTree2 m1 (node3 a b c) (node2 d e) m2 addDigits1 m1 (One a) b (Four c d e f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits1 m1 (Two a b) c (One d) m2 =-	appendTree2 m1 (node2 a b) (node2 c d) m2+        appendTree2 m1 (node2 a b) (node2 c d) m2 addDigits1 m1 (Two a b) c (Two d e) m2 =-	appendTree2 m1 (node3 a b c) (node2 d e) m2+        appendTree2 m1 (node3 a b c) (node2 d e) m2 addDigits1 m1 (Two a b) c (Three d e f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits1 m1 (Two a b) c (Four d e f g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits1 m1 (Three a b c) d (One e) m2 =-	appendTree2 m1 (node3 a b c) (node2 d e) m2+        appendTree2 m1 (node3 a b c) (node2 d e) m2 addDigits1 m1 (Three a b c) d (Two e f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits1 m1 (Three a b c) d (Three e f g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits1 m1 (Three a b c) d (Four e f g h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2 addDigits1 m1 (Four a b c d) e (One f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits1 m1 (Four a b c d) e (Two f g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits1 m1 (Four a b c d) e (Three f g h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2 addDigits1 m1 (Four a b c d) e (Four f g h i) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2  appendTree2 :: FingerTree (Node a) -> Node a -> Node a -> FingerTree (Node a) -> FingerTree (Node a) appendTree2 Empty a b xs =-	a `consTree` b `consTree` xs+        a `consTree` b `consTree` xs appendTree2 xs a b Empty =-	xs `snocTree` a `snocTree` b+        xs `snocTree` a `snocTree` b appendTree2 (Single x) a b xs =-	x `consTree` a `consTree` b `consTree` xs+        x `consTree` a `consTree` b `consTree` xs appendTree2 xs a b (Single x) =-	xs `snocTree` a `snocTree` b `snocTree` x+        xs `snocTree` a `snocTree` b `snocTree` x appendTree2 (Deep s1 pr1 m1 sf1) a b (Deep s2 pr2 m2 sf2) =-	Deep (s1 + size a + size b + s2) pr1 (addDigits2 m1 sf1 a b pr2 m2) sf2+        Deep (s1 + size a + size b + s2) pr1 (addDigits2 m1 sf1 a b pr2 m2) sf2  addDigits2 :: FingerTree (Node (Node a)) -> Digit (Node a) -> Node a -> Node a -> Digit (Node a) -> FingerTree (Node (Node a)) -> FingerTree (Node (Node a)) addDigits2 m1 (One a) b c (One d) m2 =-	appendTree2 m1 (node2 a b) (node2 c d) m2+        appendTree2 m1 (node2 a b) (node2 c d) m2 addDigits2 m1 (One a) b c (Two d e) m2 =-	appendTree2 m1 (node3 a b c) (node2 d e) m2+        appendTree2 m1 (node3 a b c) (node2 d e) m2 addDigits2 m1 (One a) b c (Three d e f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits2 m1 (One a) b c (Four d e f g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits2 m1 (Two a b) c d (One e) m2 =-	appendTree2 m1 (node3 a b c) (node2 d e) m2+        appendTree2 m1 (node3 a b c) (node2 d e) m2 addDigits2 m1 (Two a b) c d (Two e f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits2 m1 (Two a b) c d (Three e f g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits2 m1 (Two a b) c d (Four e f g h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2 addDigits2 m1 (Three a b c) d e (One f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits2 m1 (Three a b c) d e (Two f g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits2 m1 (Three a b c) d e (Three f g h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2 addDigits2 m1 (Three a b c) d e (Four f g h i) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2 addDigits2 m1 (Four a b c d) e f (One g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits2 m1 (Four a b c d) e f (Two g h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2 addDigits2 m1 (Four a b c d) e f (Three g h i) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2 addDigits2 m1 (Four a b c d) e f (Four g h i j) m2 =-	appendTree4 m1 (node3 a b c) (node3 d e f) (node2 g h) (node2 i j) m2+        appendTree4 m1 (node3 a b c) (node3 d e f) (node2 g h) (node2 i j) m2  appendTree3 :: FingerTree (Node a) -> Node a -> Node a -> Node a -> FingerTree (Node a) -> FingerTree (Node a) appendTree3 Empty a b c xs =-	a `consTree` b `consTree` c `consTree` xs+        a `consTree` b `consTree` c `consTree` xs appendTree3 xs a b c Empty =-	xs `snocTree` a `snocTree` b `snocTree` c+        xs `snocTree` a `snocTree` b `snocTree` c appendTree3 (Single x) a b c xs =-	x `consTree` a `consTree` b `consTree` c `consTree` xs+        x `consTree` a `consTree` b `consTree` c `consTree` xs appendTree3 xs a b c (Single x) =-	xs `snocTree` a `snocTree` b `snocTree` c `snocTree` x+        xs `snocTree` a `snocTree` b `snocTree` c `snocTree` x appendTree3 (Deep s1 pr1 m1 sf1) a b c (Deep s2 pr2 m2 sf2) =-	Deep (s1 + size a + size b + size c + s2) pr1 (addDigits3 m1 sf1 a b c pr2 m2) sf2+        Deep (s1 + size a + size b + size c + s2) pr1 (addDigits3 m1 sf1 a b c pr2 m2) sf2  addDigits3 :: FingerTree (Node (Node a)) -> Digit (Node a) -> Node a -> Node a -> Node a -> Digit (Node a) -> FingerTree (Node (Node a)) -> FingerTree (Node (Node a)) addDigits3 m1 (One a) b c d (One e) m2 =-	appendTree2 m1 (node3 a b c) (node2 d e) m2+        appendTree2 m1 (node3 a b c) (node2 d e) m2 addDigits3 m1 (One a) b c d (Two e f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits3 m1 (One a) b c d (Three e f g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits3 m1 (One a) b c d (Four e f g h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2 addDigits3 m1 (Two a b) c d e (One f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits3 m1 (Two a b) c d e (Two f g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits3 m1 (Two a b) c d e (Three f g h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2 addDigits3 m1 (Two a b) c d e (Four f g h i) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2 addDigits3 m1 (Three a b c) d e f (One g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits3 m1 (Three a b c) d e f (Two g h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2 addDigits3 m1 (Three a b c) d e f (Three g h i) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2 addDigits3 m1 (Three a b c) d e f (Four g h i j) m2 =-	appendTree4 m1 (node3 a b c) (node3 d e f) (node2 g h) (node2 i j) m2+        appendTree4 m1 (node3 a b c) (node3 d e f) (node2 g h) (node2 i j) m2 addDigits3 m1 (Four a b c d) e f g (One h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2 addDigits3 m1 (Four a b c d) e f g (Two h i) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2 addDigits3 m1 (Four a b c d) e f g (Three h i j) m2 =-	appendTree4 m1 (node3 a b c) (node3 d e f) (node2 g h) (node2 i j) m2+        appendTree4 m1 (node3 a b c) (node3 d e f) (node2 g h) (node2 i j) m2 addDigits3 m1 (Four a b c d) e f g (Four h i j k) m2 =-	appendTree4 m1 (node3 a b c) (node3 d e f) (node3 g h i) (node2 j k) m2+        appendTree4 m1 (node3 a b c) (node3 d e f) (node3 g h i) (node2 j k) m2  appendTree4 :: FingerTree (Node a) -> Node a -> Node a -> Node a -> Node a -> FingerTree (Node a) -> FingerTree (Node a) appendTree4 Empty a b c d xs =-	a `consTree` b `consTree` c `consTree` d `consTree` xs+        a `consTree` b `consTree` c `consTree` d `consTree` xs appendTree4 xs a b c d Empty =-	xs `snocTree` a `snocTree` b `snocTree` c `snocTree` d+        xs `snocTree` a `snocTree` b `snocTree` c `snocTree` d appendTree4 (Single x) a b c d xs =-	x `consTree` a `consTree` b `consTree` c `consTree` d `consTree` xs+        x `consTree` a `consTree` b `consTree` c `consTree` d `consTree` xs appendTree4 xs a b c d (Single x) =-	xs `snocTree` a `snocTree` b `snocTree` c `snocTree` d `snocTree` x+        xs `snocTree` a `snocTree` b `snocTree` c `snocTree` d `snocTree` x appendTree4 (Deep s1 pr1 m1 sf1) a b c d (Deep s2 pr2 m2 sf2) =-	Deep (s1 + size a + size b + size c + size d + s2) pr1 (addDigits4 m1 sf1 a b c d pr2 m2) sf2+        Deep (s1 + size a + size b + size c + size d + s2) pr1 (addDigits4 m1 sf1 a b c d pr2 m2) sf2  addDigits4 :: FingerTree (Node (Node a)) -> Digit (Node a) -> Node a -> Node a -> Node a -> Node a -> Digit (Node a) -> FingerTree (Node (Node a)) -> FingerTree (Node (Node a)) addDigits4 m1 (One a) b c d e (One f) m2 =-	appendTree2 m1 (node3 a b c) (node3 d e f) m2+        appendTree2 m1 (node3 a b c) (node3 d e f) m2 addDigits4 m1 (One a) b c d e (Two f g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits4 m1 (One a) b c d e (Three f g h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2 addDigits4 m1 (One a) b c d e (Four f g h i) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2 addDigits4 m1 (Two a b) c d e f (One g) m2 =-	appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2+        appendTree3 m1 (node3 a b c) (node2 d e) (node2 f g) m2 addDigits4 m1 (Two a b) c d e f (Two g h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2 addDigits4 m1 (Two a b) c d e f (Three g h i) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2 addDigits4 m1 (Two a b) c d e f (Four g h i j) m2 =-	appendTree4 m1 (node3 a b c) (node3 d e f) (node2 g h) (node2 i j) m2+        appendTree4 m1 (node3 a b c) (node3 d e f) (node2 g h) (node2 i j) m2 addDigits4 m1 (Three a b c) d e f g (One h) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node2 g h) m2 addDigits4 m1 (Three a b c) d e f g (Two h i) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2 addDigits4 m1 (Three a b c) d e f g (Three h i j) m2 =-	appendTree4 m1 (node3 a b c) (node3 d e f) (node2 g h) (node2 i j) m2+        appendTree4 m1 (node3 a b c) (node3 d e f) (node2 g h) (node2 i j) m2 addDigits4 m1 (Three a b c) d e f g (Four h i j k) m2 =-	appendTree4 m1 (node3 a b c) (node3 d e f) (node3 g h i) (node2 j k) m2+        appendTree4 m1 (node3 a b c) (node3 d e f) (node3 g h i) (node2 j k) m2 addDigits4 m1 (Four a b c d) e f g h (One i) m2 =-	appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2+        appendTree3 m1 (node3 a b c) (node3 d e f) (node3 g h i) m2 addDigits4 m1 (Four a b c d) e f g h (Two i j) m2 =-	appendTree4 m1 (node3 a b c) (node3 d e f) (node2 g h) (node2 i j) m2+        appendTree4 m1 (node3 a b c) (node3 d e f) (node2 g h) (node2 i j) m2 addDigits4 m1 (Four a b c d) e f g h (Three i j k) m2 =-	appendTree4 m1 (node3 a b c) (node3 d e f) (node3 g h i) (node2 j k) m2+        appendTree4 m1 (node3 a b c) (node3 d e f) (node3 g h i) (node2 j k) m2 addDigits4 m1 (Four a b c d) e f g h (Four i j k l) m2 =-	appendTree4 m1 (node3 a b c) (node3 d e f) (node3 g h i) (node3 j k l) m2+        appendTree4 m1 (node3 a b c) (node3 d e f) (node3 g h i) (node3 j k l) m2  ------------------------------------------------------------------------ -- Deconstruction ------------------------------------------------------------------------  -- | /O(1)/. Is this the empty sequence?-null		:: Seq a -> Bool+null            :: Seq a -> Bool null (Seq Empty) = True-null _		=  False+null _          =  False  -- | /O(1)/. The number of elements in the sequence.-length		:: Seq a -> Int+length          :: Seq a -> Int length (Seq xs) =  size xs  -- Views@@ -524,10 +524,10 @@  -- | View of the left end of a sequence. data ViewL a-	= EmptyL	-- ^ empty sequence-	| a :< Seq a	-- ^ leftmost element and the rest of the sequence+        = EmptyL        -- ^ empty sequence+        | a :< Seq a    -- ^ leftmost element and the rest of the sequence #ifndef __HADDOCK__-	deriving (Eq, Show)+        deriving (Eq, Show) #else instance Eq a => Eq (ViewL a) instance Show a => Show (ViewL a)@@ -535,79 +535,79 @@   instance Functor ViewL where-	fmap _ EmptyL		= EmptyL-	fmap f (x :< xs)	= f x :< fmap f xs+        fmap _ EmptyL           = EmptyL+        fmap f (x :< xs)        = f x :< fmap f xs  -- | /O(1)/. Analyse the left end of a sequence.-viewl		::  Seq a -> ViewL a-viewl (Seq xs)	=  case viewLTree xs of-	Nothing2 -> EmptyL-	Just2 (Elem x) xs' -> x :< Seq xs'+viewl           ::  Seq a -> ViewL a+viewl (Seq xs)  =  case viewLTree xs of+        Nothing2 -> EmptyL+        Just2 (Elem x) xs' -> x :< Seq xs'  {-# SPECIALIZE viewLTree :: FingerTree (Elem a) -> Maybe2 (Elem a) (FingerTree (Elem a)) #-} {-# SPECIALIZE viewLTree :: FingerTree (Node a) -> Maybe2 (Node a) (FingerTree (Node a)) #-}-viewLTree	:: Sized a => FingerTree a -> Maybe2 a (FingerTree a)-viewLTree Empty			= Nothing2-viewLTree (Single a)		= Just2 a Empty+viewLTree       :: Sized a => FingerTree a -> Maybe2 a (FingerTree a)+viewLTree Empty                 = Nothing2+viewLTree (Single a)            = Just2 a Empty viewLTree (Deep s (One a) m sf) = Just2 a (case viewLTree m of-	Nothing2	-> digitToTree sf-	Just2 b m'	-> Deep (s - size a) (nodeToDigit b) m' sf)+        Nothing2        -> digitToTree sf+        Just2 b m'      -> Deep (s - size a) (nodeToDigit b) m' sf) viewLTree (Deep s (Two a b) m sf) =-	Just2 a (Deep (s - size a) (One b) m sf)+        Just2 a (Deep (s - size a) (One b) m sf) viewLTree (Deep s (Three a b c) m sf) =-	Just2 a (Deep (s - size a) (Two b c) m sf)+        Just2 a (Deep (s - size a) (Two b c) m sf) viewLTree (Deep s (Four a b c d) m sf) =-	Just2 a (Deep (s - size a) (Three b c d) m sf)+        Just2 a (Deep (s - size a) (Three b c d) m sf)  -- | View of the right end of a sequence. data ViewR a-	= EmptyR	-- ^ empty sequence-	| Seq a :> a	-- ^ the sequence minus the rightmost element,-			-- and the rightmost element+        = EmptyR        -- ^ empty sequence+        | Seq a :> a    -- ^ the sequence minus the rightmost element,+                        -- and the rightmost element #ifndef __HADDOCK__-	deriving (Eq, Show)+        deriving (Eq, Show) #else instance Eq a => Eq (ViewR a) instance Show a => Show (ViewR a) #endif  instance Functor ViewR where-	fmap _ EmptyR		= EmptyR-	fmap f (xs :> x)	= fmap f xs :> f x+        fmap _ EmptyR           = EmptyR+        fmap f (xs :> x)        = fmap f xs :> f x  -- | /O(1)/. Analyse the right end of a sequence.-viewr		::  Seq a -> ViewR a-viewr (Seq xs)	=  case viewRTree xs of-	Nothing2 -> EmptyR-	Just2 xs' (Elem x) -> Seq xs' :> x+viewr           ::  Seq a -> ViewR a+viewr (Seq xs)  =  case viewRTree xs of+        Nothing2 -> EmptyR+        Just2 xs' (Elem x) -> Seq xs' :> x  {-# SPECIALIZE viewRTree :: FingerTree (Elem a) -> Maybe2 (FingerTree (Elem a)) (Elem a) #-} {-# SPECIALIZE viewRTree :: FingerTree (Node a) -> Maybe2 (FingerTree (Node a)) (Node a) #-}-viewRTree	:: Sized a => FingerTree a -> Maybe2 (FingerTree a) a-viewRTree Empty			= Nothing2-viewRTree (Single z)		= Just2 Empty z+viewRTree       :: Sized a => FingerTree a -> Maybe2 (FingerTree a) a+viewRTree Empty                 = Nothing2+viewRTree (Single z)            = Just2 Empty z viewRTree (Deep s pr m (One z)) = Just2 (case viewRTree m of-	Nothing2	->  digitToTree pr-	Just2 m' y	->  Deep (s - size z) pr m' (nodeToDigit y)) z+        Nothing2        ->  digitToTree pr+        Just2 m' y      ->  Deep (s - size z) pr m' (nodeToDigit y)) z viewRTree (Deep s pr m (Two y z)) =-	Just2 (Deep (s - size z) pr m (One y)) z+        Just2 (Deep (s - size z) pr m (One y)) z viewRTree (Deep s pr m (Three x y z)) =-	Just2 (Deep (s - size z) pr m (Two x y)) z+        Just2 (Deep (s - size z) pr m (Two x y)) z viewRTree (Deep s pr m (Four w x y z)) =-	Just2 (Deep (s - size z) pr m (Three w x y)) z+        Just2 (Deep (s - size z) pr m (Three w x y)) z  -- Indexing  -- | /O(log(min(i,n-i)))/. The element at the specified position-index		:: Seq a -> Int -> a+index           :: Seq a -> Int -> a index (Seq xs) i   | 0 <= i && i < size xs = case lookupTree (-i) xs of-				Place _ (Elem x) -> x-  | otherwise	= error "index out of bounds"+                                Place _ (Elem x) -> x+  | otherwise   = error "index out of bounds"  data Place a = Place {-# UNPACK #-} !Int a #if TESTING-	deriving Show+        deriving Show #endif  {-# SPECIALIZE lookupTree :: Int -> FingerTree (Elem a) -> Place (Elem a) #-}@@ -615,135 +615,135 @@ lookupTree :: Sized a => Int -> FingerTree a -> Place a lookupTree i (Single x) = Place i x lookupTree i (Deep _ pr m sf)-  | vpr > 0	=  lookupDigit i pr-  | vm > 0	=  case lookupTree vpr m of-			Place i' xs -> lookupNode i' xs-  | otherwise	=  lookupDigit vm sf-  where	vpr	=  i + size pr-	vm	=  vpr + size m+  | vpr > 0     =  lookupDigit i pr+  | vm > 0      =  case lookupTree vpr m of+                        Place i' xs -> lookupNode i' xs+  | otherwise   =  lookupDigit vm sf+  where vpr     =  i + size pr+        vm      =  vpr + size m  {-# SPECIALIZE lookupNode :: Int -> Node (Elem a) -> Place (Elem a) #-} {-# SPECIALIZE lookupNode :: Int -> Node (Node a) -> Place (Node a) #-} lookupNode :: Sized a => Int -> Node a -> Place a lookupNode i (Node2 _ a b)-  | va > 0	= Place i a-  | otherwise	= Place va b-  where	va	= i + size a+  | va > 0      = Place i a+  | otherwise   = Place va b+  where va      = i + size a lookupNode i (Node3 _ a b c)-  | va > 0	= Place i a-  | vab > 0	= Place va b-  | otherwise	= Place vab c-  where	va	= i + size a-	vab	= va + size b+  | va > 0      = Place i a+  | vab > 0     = Place va b+  | otherwise   = Place vab c+  where va      = i + size a+        vab     = va + size b  {-# SPECIALIZE lookupDigit :: Int -> Digit (Elem a) -> Place (Elem a) #-} {-# SPECIALIZE lookupDigit :: Int -> Digit (Node a) -> Place (Node a) #-} lookupDigit :: Sized a => Int -> Digit a -> Place a lookupDigit i (One a) = Place i a lookupDigit i (Two a b)-  | va > 0	= Place i a-  | otherwise	= Place va b-  where	va	= i + size a+  | va > 0      = Place i a+  | otherwise   = Place va b+  where va      = i + size a lookupDigit i (Three a b c)-  | va > 0	= Place i a-  | vab > 0	= Place va b-  | otherwise	= Place vab c-  where	va	= i + size a-	vab	= va + size b+  | va > 0      = Place i a+  | vab > 0     = Place va b+  | otherwise   = Place vab c+  where va      = i + size a+        vab     = va + size b lookupDigit i (Four a b c d)-  | va > 0	= Place i a-  | vab > 0	= Place va b-  | vabc > 0	= Place vab c-  | otherwise	= Place vabc d-  where	va	= i + size a-	vab	= va + size b-	vabc	= vab + size c+  | va > 0      = Place i a+  | vab > 0     = Place va b+  | vabc > 0    = Place vab c+  | otherwise   = Place vabc d+  where va      = i + size a+        vab     = va + size b+        vabc    = vab + size c  -- | /O(log(min(i,n-i)))/. Replace the element at the specified position-update		:: Int -> a -> Seq a -> Seq a-update i x	= adjust (const x) i+update          :: Int -> a -> Seq a -> Seq a+update i x      = adjust (const x) i  -- | /O(log(min(i,n-i)))/. Update the element at the specified position-adjust		:: (a -> a) -> Int -> Seq a -> Seq a+adjust          :: (a -> a) -> Int -> Seq a -> Seq a adjust f i (Seq xs)   | 0 <= i && i < size xs = Seq (adjustTree (const (fmap f)) (-i) xs)-  | otherwise	= Seq xs+  | otherwise   = Seq xs  {-# SPECIALIZE adjustTree :: (Int -> Elem a -> Elem a) -> Int -> FingerTree (Elem a) -> FingerTree (Elem a) #-} {-# SPECIALIZE adjustTree :: (Int -> Node a -> Node a) -> Int -> FingerTree (Node a) -> FingerTree (Node a) #-}-adjustTree	:: Sized a => (Int -> a -> a) ->-			Int -> FingerTree a -> FingerTree a+adjustTree      :: Sized a => (Int -> a -> a) ->+                        Int -> FingerTree a -> FingerTree a adjustTree f i (Single x) = Single (f i x) adjustTree f i (Deep s pr m sf)-  | vpr > 0	= Deep s (adjustDigit f i pr) m sf-  | vm > 0	= Deep s pr (adjustTree (adjustNode f) vpr m) sf-  | otherwise	= Deep s pr m (adjustDigit f vm sf)-  where	vpr	= i + size pr-	vm	= vpr + size m+  | vpr > 0     = Deep s (adjustDigit f i pr) m sf+  | vm > 0      = Deep s pr (adjustTree (adjustNode f) vpr m) sf+  | otherwise   = Deep s pr m (adjustDigit f vm sf)+  where vpr     = i + size pr+        vm      = vpr + size m  {-# SPECIALIZE adjustNode :: (Int -> Elem a -> Elem a) -> Int -> Node (Elem a) -> Node (Elem a) #-} {-# SPECIALIZE adjustNode :: (Int -> Node a -> Node a) -> Int -> Node (Node a) -> Node (Node a) #-}-adjustNode	:: Sized a => (Int -> a -> a) -> Int -> Node a -> Node a+adjustNode      :: Sized a => (Int -> a -> a) -> Int -> Node a -> Node a adjustNode f i (Node2 s a b)-  | va > 0	= Node2 s (f i a) b-  | otherwise	= Node2 s a (f va b)-  where	va	= i + size a+  | va > 0      = Node2 s (f i a) b+  | otherwise   = Node2 s a (f va b)+  where va      = i + size a adjustNode f i (Node3 s a b c)-  | va > 0	= Node3 s (f i a) b c-  | vab > 0	= Node3 s a (f va b) c-  | otherwise	= Node3 s a b (f vab c)-  where	va	= i + size a-	vab	= va + size b+  | va > 0      = Node3 s (f i a) b c+  | vab > 0     = Node3 s a (f va b) c+  | otherwise   = Node3 s a b (f vab c)+  where va      = i + size a+        vab     = va + size b  {-# SPECIALIZE adjustDigit :: (Int -> Elem a -> Elem a) -> Int -> Digit (Elem a) -> Digit (Elem a) #-} {-# SPECIALIZE adjustDigit :: (Int -> Node a -> Node a) -> Int -> Digit (Node a) -> Digit (Node a) #-}-adjustDigit	:: Sized a => (Int -> a -> a) -> Int -> Digit a -> Digit a+adjustDigit     :: Sized a => (Int -> a -> a) -> Int -> Digit a -> Digit a adjustDigit f i (One a) = One (f i a) adjustDigit f i (Two a b)-  | va > 0	= Two (f i a) b-  | otherwise	= Two a (f va b)-  where	va	= i + size a+  | va > 0      = Two (f i a) b+  | otherwise   = Two a (f va b)+  where va      = i + size a adjustDigit f i (Three a b c)-  | va > 0	= Three (f i a) b c-  | vab > 0	= Three a (f va b) c-  | otherwise	= Three a b (f vab c)-  where	va	= i + size a-	vab	= va + size b+  | va > 0      = Three (f i a) b c+  | vab > 0     = Three a (f va b) c+  | otherwise   = Three a b (f vab c)+  where va      = i + size a+        vab     = va + size b adjustDigit f i (Four a b c d)-  | va > 0	= Four (f i a) b c d-  | vab > 0	= Four a (f va b) c d-  | vabc > 0	= Four a b (f vab c) d-  | otherwise	= Four a b c (f vabc d)-  where	va	= i + size a-	vab	= va + size b-	vabc	= vab + size c+  | va > 0      = Four (f i a) b c d+  | vab > 0     = Four a (f va b) c d+  | vabc > 0    = Four a b (f vab c) d+  | otherwise   = Four a b c (f vabc d)+  where va      = i + size a+        vab     = va + size b+        vabc    = vab + size c  -- Splitting  -- | /O(log(min(i,n-i)))/. The first @i@ elements of a sequence.-take		:: Int -> Seq a -> Seq a-take i		=  fst . splitAt i+take            :: Int -> Seq a -> Seq a+take i          =  fst . splitAt i  -- | /O(log(min(i,n-i)))/. Elements of sequence after the first @i@.-drop		:: Int -> Seq a -> Seq a-drop i		=  snd . splitAt i+drop            :: Int -> Seq a -> Seq a+drop i          =  snd . splitAt i  -- | /O(log(min(i,n-i)))/. Split a sequence at a given position.-splitAt			:: Int -> Seq a -> (Seq a, Seq a)-splitAt i (Seq xs)	=  (Seq l, Seq r)-  where	(l, r)		=  split i xs+splitAt                 :: Int -> Seq a -> (Seq a, Seq a)+splitAt i (Seq xs)      =  (Seq l, Seq r)+  where (l, r)          =  split i xs  split :: Int -> FingerTree (Elem a) ->-	(FingerTree (Elem a), FingerTree (Elem a))-split i Empty	= i `seq` (Empty, Empty)+        (FingerTree (Elem a), FingerTree (Elem a))+split i Empty   = i `seq` (Empty, Empty) split i xs-  | size xs > i	= (l, consTree x r)-  | otherwise	= (xs, Empty)+  | size xs > i = (l, consTree x r)+  | otherwise   = (xs, Empty)   where Split l x r = splitTree (-i) xs  data Split t a = Split t a t #if TESTING-	deriving Show+        deriving Show #endif  {-# SPECIALIZE splitTree :: Int -> FingerTree (Elem a) -> Split (FingerTree (Elem a)) (Elem a) #-}@@ -751,80 +751,80 @@ splitTree :: Sized a => Int -> FingerTree a -> Split (FingerTree a) a splitTree i (Single x) = i `seq` Split Empty x Empty splitTree i (Deep _ pr m sf)-  | vpr > 0	= case splitDigit i pr of-			Split l x r -> Split (maybe Empty digitToTree l) x (deepL r m sf)-  | vm > 0	= case splitTree vpr m of-			Split ml xs mr -> case splitNode (vpr + size ml) xs of-			    Split l x r -> Split (deepR pr  ml l) x (deepL r mr sf)-  | otherwise	= case splitDigit vm sf of-			Split l x r -> Split (deepR pr  m  l) x (maybe Empty digitToTree r)-  where	vpr	= i + size pr-	vm	= vpr + size m+  | vpr > 0     = case splitDigit i pr of+                        Split l x r -> Split (maybe Empty digitToTree l) x (deepL r m sf)+  | vm > 0      = case splitTree vpr m of+                        Split ml xs mr -> case splitNode (vpr + size ml) xs of+                            Split l x r -> Split (deepR pr  ml l) x (deepL r mr sf)+  | otherwise   = case splitDigit vm sf of+                        Split l x r -> Split (deepR pr  m  l) x (maybe Empty digitToTree r)+  where vpr     = i + size pr+        vm      = vpr + size m  {-# SPECIALIZE deepL :: Maybe (Digit (Elem a)) -> FingerTree (Node (Elem a)) -> Digit (Elem a) -> FingerTree (Elem a) #-} {-# SPECIALIZE deepL :: Maybe (Digit (Node a)) -> FingerTree (Node (Node a)) -> Digit (Node a) -> FingerTree (Node a) #-} deepL :: Sized a => Maybe (Digit a) -> FingerTree (Node a) -> Digit a -> FingerTree a-deepL Nothing m sf	= case viewLTree m of-	Nothing2	-> digitToTree sf-	Just2 a m'	-> deep (nodeToDigit a) m' sf-deepL (Just pr) m sf	= deep pr m sf+deepL Nothing m sf      = case viewLTree m of+        Nothing2        -> digitToTree sf+        Just2 a m'      -> deep (nodeToDigit a) m' sf+deepL (Just pr) m sf    = deep pr m sf  {-# SPECIALIZE deepR :: Digit (Elem a) -> FingerTree (Node (Elem a)) -> Maybe (Digit (Elem a)) -> FingerTree (Elem a) #-} {-# SPECIALIZE deepR :: Digit (Node a) -> FingerTree (Node (Node a)) -> Maybe (Digit (Node a)) -> FingerTree (Node a) #-} deepR :: Sized a => Digit a -> FingerTree (Node a) -> Maybe (Digit a) -> FingerTree a-deepR pr m Nothing	= case viewRTree m of-	Nothing2	-> digitToTree pr-	Just2 m' a	-> deep pr m' (nodeToDigit a)-deepR pr m (Just sf)	= deep pr m sf+deepR pr m Nothing      = case viewRTree m of+        Nothing2        -> digitToTree pr+        Just2 m' a      -> deep pr m' (nodeToDigit a)+deepR pr m (Just sf)    = deep pr m sf  {-# SPECIALIZE splitNode :: Int -> Node (Elem a) -> Split (Maybe (Digit (Elem a))) (Elem a) #-} {-# SPECIALIZE splitNode :: Int -> Node (Node a) -> Split (Maybe (Digit (Node a))) (Node a) #-} splitNode :: Sized a => Int -> Node a -> Split (Maybe (Digit a)) a splitNode i (Node2 _ a b)-  | va > 0	= Split Nothing a (Just (One b))-  | otherwise	= Split (Just (One a)) b Nothing-  where	va	= i + size a+  | va > 0      = Split Nothing a (Just (One b))+  | otherwise   = Split (Just (One a)) b Nothing+  where va      = i + size a splitNode i (Node3 _ a b c)-  | va > 0	= Split Nothing a (Just (Two b c))-  | vab > 0	= Split (Just (One a)) b (Just (One c))-  | otherwise	= Split (Just (Two a b)) c Nothing-  where	va	= i + size a-	vab	= va + size b+  | va > 0      = Split Nothing a (Just (Two b c))+  | vab > 0     = Split (Just (One a)) b (Just (One c))+  | otherwise   = Split (Just (Two a b)) c Nothing+  where va      = i + size a+        vab     = va + size b  {-# SPECIALIZE splitDigit :: Int -> Digit (Elem a) -> Split (Maybe (Digit (Elem a))) (Elem a) #-} {-# SPECIALIZE splitDigit :: Int -> Digit (Node a) -> Split (Maybe (Digit (Node a))) (Node a) #-} splitDigit :: Sized a => Int -> Digit a -> Split (Maybe (Digit a)) a splitDigit i (One a) = i `seq` Split Nothing a Nothing splitDigit i (Two a b)-  | va > 0	= Split Nothing a (Just (One b))-  | otherwise	= Split (Just (One a)) b Nothing-  where	va	= i + size a+  | va > 0      = Split Nothing a (Just (One b))+  | otherwise   = Split (Just (One a)) b Nothing+  where va      = i + size a splitDigit i (Three a b c)-  | va > 0	= Split Nothing a (Just (Two b c))-  | vab > 0	= Split (Just (One a)) b (Just (One c))-  | otherwise	= Split (Just (Two a b)) c Nothing-  where	va	= i + size a-	vab	= va + size b+  | va > 0      = Split Nothing a (Just (Two b c))+  | vab > 0     = Split (Just (One a)) b (Just (One c))+  | otherwise   = Split (Just (Two a b)) c Nothing+  where va      = i + size a+        vab     = va + size b splitDigit i (Four a b c d)-  | va > 0	= Split Nothing a (Just (Three b c d))-  | vab > 0	= Split (Just (One a)) b (Just (Two c d))-  | vabc > 0	= Split (Just (Two a b)) c (Just (One d))-  | otherwise	= Split (Just (Three a b c)) d Nothing-  where	va	= i + size a-	vab	= va + size b-	vabc	= vab + size c+  | va > 0      = Split Nothing a (Just (Three b c d))+  | vab > 0     = Split (Just (One a)) b (Just (Two c d))+  | vabc > 0    = Split (Just (Two a b)) c (Just (One d))+  | otherwise   = Split (Just (Three a b c)) d Nothing+  where va      = i + size a+        vab     = va + size b+        vabc    = vab + size c  ------------------------------------------------------------------------ -- Lists ------------------------------------------------------------------------  -- | /O(n)/. Create a sequence from a finite list of elements.-fromList  	:: [a] -> Seq a-fromList  	=  Data.List.foldl' (|>) empty+fromList        :: [a] -> Seq a+fromList        =  Data.List.foldl' (|>) empty  -- | /O(n)/. List of elements of the sequence.-toList		:: Seq a -> [a]-toList		=  foldr (:) []+toList          :: Seq a -> [a]+toList          =  foldr (:) []  ------------------------------------------------------------------------ -- Folds@@ -840,7 +840,7 @@ foldrTree _ z Empty = z foldrTree f z (Single x) = x `f` z foldrTree f z (Deep _ pr m sf) =-	foldrDigit f (foldrTree (flip (foldrNode f)) (foldrDigit f z sf) m) pr+        foldrDigit f (foldrTree (flip (foldrNode f)) (foldrDigit f z sf) m) pr  foldrDigit :: (a -> b -> b) -> b -> Digit a -> b foldrDigit f z (One a) = a `f` z@@ -862,7 +862,7 @@ foldr1Tree _ Empty = error "foldr1: empty sequence" foldr1Tree _ (Single x) = x foldr1Tree f (Deep _ pr m sf) =-	foldrDigit f (foldrTree (flip (foldrNode f)) (foldr1Digit f sf) m) pr+        foldrDigit f (foldrTree (flip (foldrNode f)) (foldr1Digit f sf) m) pr  foldr1Digit :: (a -> a -> a) -> Digit a -> a foldr1Digit f (One a) = a@@ -880,7 +880,7 @@ foldlTree _ z Empty = z foldlTree f z (Single x) = z `f` x foldlTree f z (Deep _ pr m sf) =-	foldlDigit f (foldlTree (foldlNode f) (foldlDigit f z pr) m) sf+        foldlDigit f (foldlTree (foldlNode f) (foldlDigit f z pr) m) sf  foldlDigit :: (a -> b -> a) -> a -> Digit b -> a foldlDigit f z (One a) = z `f` a@@ -902,7 +902,7 @@ foldl1Tree _ Empty = error "foldl1: empty sequence" foldl1Tree _ (Single x) = x foldl1Tree f (Deep _ pr m sf) =-	foldlDigit f (foldlTree (foldlNode f) (foldl1Digit f pr) m) sf+        foldlDigit f (foldlTree (foldlNode f) (foldl1Digit f pr) m) sf  foldl1Digit :: (a -> a -> a) -> Digit a -> a foldl1Digit f (One a) = a@@ -950,9 +950,9 @@ reverseTree _ Empty = Empty reverseTree f (Single x) = Single (f x) reverseTree f (Deep s pr m sf) =-	Deep s (reverseDigit f sf)-		(reverseTree (reverseNode f) m)-		(reverseDigit f pr)+        Deep s (reverseDigit f sf)+                (reverseTree (reverseNode f) m)+                (reverseDigit f pr)  reverseDigit :: (a -> a) -> Digit a -> Digit a reverseDigit f (One a) = One (f a)@@ -971,76 +971,76 @@ ------------------------------------------------------------------------  instance Arbitrary a => Arbitrary (Seq a) where-	arbitrary = liftM Seq arbitrary-	coarbitrary (Seq x) = coarbitrary x+        arbitrary = liftM Seq arbitrary+        coarbitrary (Seq x) = coarbitrary x  instance Arbitrary a => Arbitrary (Elem a) where-	arbitrary = liftM Elem arbitrary-	coarbitrary (Elem x) = coarbitrary x+        arbitrary = liftM Elem arbitrary+        coarbitrary (Elem x) = coarbitrary x  instance (Arbitrary a, Sized a) => Arbitrary (FingerTree a) where-	arbitrary = sized arb-	  where arb :: (Arbitrary a, Sized a) => Int -> Gen (FingerTree a)-		arb 0 = return Empty-		arb 1 = liftM Single arbitrary-		arb n = liftM3 deep arbitrary (arb (n `div` 2)) arbitrary+        arbitrary = sized arb+          where arb :: (Arbitrary a, Sized a) => Int -> Gen (FingerTree a)+                arb 0 = return Empty+                arb 1 = liftM Single arbitrary+                arb n = liftM3 deep arbitrary (arb (n `div` 2)) arbitrary -	coarbitrary Empty = variant 0-	coarbitrary (Single x) = variant 1 . coarbitrary x-	coarbitrary (Deep _ pr m sf) =-		variant 2 . coarbitrary pr . coarbitrary m . coarbitrary sf+        coarbitrary Empty = variant 0+        coarbitrary (Single x) = variant 1 . coarbitrary x+        coarbitrary (Deep _ pr m sf) =+                variant 2 . coarbitrary pr . coarbitrary m . coarbitrary sf  instance (Arbitrary a, Sized a) => Arbitrary (Node a) where-	arbitrary = oneof [-			liftM2 node2 arbitrary arbitrary,-			liftM3 node3 arbitrary arbitrary arbitrary]+        arbitrary = oneof [+                        liftM2 node2 arbitrary arbitrary,+                        liftM3 node3 arbitrary arbitrary arbitrary] -	coarbitrary (Node2 _ a b) = variant 0 . coarbitrary a . coarbitrary b-	coarbitrary (Node3 _ a b c) =-		variant 1 . coarbitrary a . coarbitrary b . coarbitrary c+        coarbitrary (Node2 _ a b) = variant 0 . coarbitrary a . coarbitrary b+        coarbitrary (Node3 _ a b c) =+                variant 1 . coarbitrary a . coarbitrary b . coarbitrary c  instance Arbitrary a => Arbitrary (Digit a) where-	arbitrary = oneof [-			liftM One arbitrary,-			liftM2 Two arbitrary arbitrary,-			liftM3 Three arbitrary arbitrary arbitrary,-			liftM4 Four arbitrary arbitrary arbitrary arbitrary]+        arbitrary = oneof [+                        liftM One arbitrary,+                        liftM2 Two arbitrary arbitrary,+                        liftM3 Three arbitrary arbitrary arbitrary,+                        liftM4 Four arbitrary arbitrary arbitrary arbitrary] -	coarbitrary (One a) = variant 0 . coarbitrary a-	coarbitrary (Two a b) = variant 1 . coarbitrary a . coarbitrary b-	coarbitrary (Three a b c) =-		variant 2 . coarbitrary a . coarbitrary b . coarbitrary c-	coarbitrary (Four a b c d) =-		variant 3 . coarbitrary a . coarbitrary b . coarbitrary c . coarbitrary d+        coarbitrary (One a) = variant 0 . coarbitrary a+        coarbitrary (Two a b) = variant 1 . coarbitrary a . coarbitrary b+        coarbitrary (Three a b c) =+                variant 2 . coarbitrary a . coarbitrary b . coarbitrary c+        coarbitrary (Four a b c d) =+                variant 3 . coarbitrary a . coarbitrary b . coarbitrary c . coarbitrary d  ------------------------------------------------------------------------ -- Valid trees ------------------------------------------------------------------------  class Valid a where-	valid :: a -> Bool+        valid :: a -> Bool  instance Valid (Elem a) where-	valid _ = True+        valid _ = True  instance Valid (Seq a) where-	valid (Seq xs) = valid xs+        valid (Seq xs) = valid xs  instance (Sized a, Valid a) => Valid (FingerTree a) where-	valid Empty = True-	valid (Single x) = valid x-	valid (Deep s pr m sf) =-		s == size pr + size m + size sf && valid pr && valid m && valid sf+        valid Empty = True+        valid (Single x) = valid x+        valid (Deep s pr m sf) =+                s == size pr + size m + size sf && valid pr && valid m && valid sf  instance (Sized a, Valid a) => Valid (Node a) where-	valid (Node2 s a b) = s == size a + size b && valid a && valid b-	valid (Node3 s a b c) =-		s == size a + size b + size c && valid a && valid b && valid c+        valid (Node2 s a b) = s == size a + size b && valid a && valid b+        valid (Node3 s a b c) =+                s == size a + size b + size c && valid a && valid b && valid c  instance Valid a => Valid (Digit a) where-	valid (One a) = valid a-	valid (Two a b) = valid a && valid b-	valid (Three a b c) = valid a && valid b && valid c-	valid (Four a b c d) = valid a && valid b && valid c && valid d+        valid (One a) = valid a+        valid (Two a b) = valid a && valid b+        valid (Three a b c) = valid a && valid b && valid c+        valid (Four a b c d) = valid a && valid b && valid c && valid d  #endif

Graphics/UI/Gtk/ModelView/TreeModel.chs view

@@ -155,14 +155,14 @@    ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import System.Glib.Flags		(toFlags)+import System.Glib.Flags                (toFlags) import System.Glib.UTFString {#import Graphics.UI.Gtk.Signals#} {#import Graphics.UI.Gtk.Types#}-{#import System.Glib.GValue#}		(GValue(GValue), allocaGValue)+{#import System.Glib.GValue#}           (GValue(GValue), allocaGValue) {#import Graphics.UI.Gtk.ModelView.CustomStore#} (TreeModelFlags(..)) {#import Graphics.UI.Gtk.ModelView.Types#}  (TypedTreeModel,                                              TypedTreeModelClass,

Graphics/UI/Gtk/ModelView/TreeModelFilter.chs view

@@ -81,7 +81,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes

Graphics/UI/Gtk/ModelView/TreeModelSort.chs view

@@ -66,7 +66,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI {#import Graphics.UI.Gtk.Types#}

Graphics/UI/Gtk/ModelView/TreeRowReference.chs view

@@ -44,7 +44,7 @@   treeRowReferenceValid,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI {#import Graphics.UI.Gtk.Types#}

Graphics/UI/Gtk/ModelView/TreeSelection.chs view

@@ -104,12 +104,12 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.GList                (fromGList) import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} import Graphics.UI.Gtk.General.Enums    (SelectionMode(..))@@ -232,7 +232,7 @@ -- treeSelectionGetSelectedRows :: TreeSelectionClass self => self  -> IO [TreePath] -- ^ returns a list containing a 'TreePath' for-		  -- each selected row.+                  -- each selected row. treeSelectionGetSelectedRows self =   {# call gtk_tree_selection_get_selected_rows #}     (toTreeSelection self)

Graphics/UI/Gtk/ModelView/TreeSortable.chs view

@@ -88,14 +88,14 @@   sortColumnChanged   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI {#import Graphics.UI.Gtk.Types#}-{#import Graphics.UI.Gtk.General.Enums#}	(SortType(..))+{#import Graphics.UI.Gtk.General.Enums#}        (SortType(..)) {#import Graphics.UI.Gtk.Signals#} {#import Graphics.UI.Gtk.ModelView.Types#}-import Graphics.UI.Gtk.General.Structs	(SortColumnId,+import Graphics.UI.Gtk.General.Structs  (SortColumnId,                                          treeSortableDefaultSortColumnId )  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/ModelView/TreeView.chs view

@@ -260,19 +260,19 @@ #endif   ) where -import Control.Monad	(liftM,)-import Data.Maybe	(fromMaybe)+import Control.Monad    (liftM,)+import Data.Maybe       (fromMaybe)  import System.Glib.FFI import System.Glib.UTFString-import System.Glib.GList		(fromGList)+import System.Glib.GList                (fromGList) import System.Glib.Flags import System.Glib.Attributes import System.Glib.Properties import Graphics.UI.Gtk.Gdk.Enums        (DragAction(..)) import Graphics.UI.Gtk.Gdk.Events       (Modifier(..))-import Graphics.UI.Gtk.General.Structs	(Point, Rectangle)-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.General.Structs  (Point, Rectangle)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} import Graphics.UI.Gtk.ModelView.TreeModel (columnIdToNumber,@@ -1927,9 +1927,9 @@  -> (TreePath -> TreeViewColumn -> IO ())  -> IO (ConnectId self) onRowActivated = connect_BOXED_OBJECT__NONE "row_activated"-		   readNTP False+                   readNTP False afterRowActivated = connect_BOXED_OBJECT__NONE "row_activated"-		      readNTP True+                      readNTP True  -- | Children of this node were hidden. --

Graphics/UI/Gtk/ModelView/TreeViewColumn.chs view

@@ -128,22 +128,22 @@   afterColClicked   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString #if GTK_MAJOR_VERSION < 3-{#import System.Glib.GList#}			(fromGList)+{#import System.Glib.GList#}                    (fromGList) #endif import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object		(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object          (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}-import Graphics.UI.Gtk.General.Enums		(TreeViewColumnSizing(..),-						 SortType(..))+import Graphics.UI.Gtk.General.Enums            (TreeViewColumnSizing(..),+                                                 SortType(..)) import Graphics.UI.Gtk.General.Structs          (SortColumnId)-{#import Graphics.UI.Gtk.ModelView.TreeModel#}	()+{#import Graphics.UI.Gtk.ModelView.TreeModel#}  ()  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/ModelView/Types.chs view

@@ -73,7 +73,7 @@ import System.Glib.UTFString import System.Glib.GValue         (GValue) import System.Glib.GObject        (Quark, quarkFromString)-{#import Graphics.UI.Gtk.Types#}	(TreeModel, TreeModelSort, TreeModelFilter,+{#import Graphics.UI.Gtk.Types#}        (TreeModel, TreeModelSort, TreeModelFilter,                                    Pixbuf) import Data.Char ( isDigit ) import Control.Monad ( liftM )@@ -121,7 +121,7 @@ -- 'TreePath'. -- data TreeIter = TreeIter {-# UNPACK #-} !CInt !Word32 !Word32 !Word32-	      deriving Show+              deriving Show  {#pointer *TreeIter as TreeIterPtr -> TreeIter #} @@ -216,13 +216,13 @@ -- | Convert the given pointer to a tree path. peekTreePath :: Ptr NativeTreePath -> IO TreePath peekTreePath tpPtr | tpPtr==nullPtr = return []-		   | otherwise =+                   | otherwise =   nativeTreePathGetIndices (NativeTreePath tpPtr)  -- | Convert the given pointer to a tree path. Frees the pointer. fromTreePath :: Ptr NativeTreePath -> IO TreePath fromTreePath tpPtr | tpPtr==nullPtr = return []-		   | otherwise = do+                   | otherwise = do   path <- nativeTreePathGetIndices (NativeTreePath tpPtr)   nativeTreePathFree (NativeTreePath tpPtr)   return path

Graphics/UI/Gtk/Multiline/TextBuffer.chs view

@@ -195,7 +195,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString@@ -206,8 +206,8 @@ {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} {#import Graphics.UI.Gtk.Multiline.Types#}-import Graphics.UI.Gtk.Multiline.TextMark	(MarkName)-import Graphics.UI.Gtk.Multiline.TextTag	(TagName)+import Graphics.UI.Gtk.Multiline.TextMark       (MarkName)+import Graphics.UI.Gtk.Multiline.TextTag        (TagName)  {# context lib="gtk" prefix="gtk" #} @@ -1121,8 +1121,8 @@ -- we'll ask for the paste data and return, and at some point later -- after the main loop runs, the paste data will be inserted.) textBufferPasteClipboard :: TextBufferClass self => self-  -> Clipboard  -- ^ @clipboard@ - 	the GtkClipboard to paste from-  -> TextIter   -- ^ @location@ - 	location to insert pasted text+  -> Clipboard  -- ^ @clipboard@ -      the GtkClipboard to paste from+  -> TextIter   -- ^ @location@ -       location to insert pasted text   -> Bool       -- ^ @defaultEditable@ -   whether the buffer is editable by default   -> IO () textBufferPasteClipboard self clipboard overrideLocation defaultEditable =@@ -1137,7 +1137,7 @@ -- we'll ask for the paste data and return, and at some point later -- after the main loop runs, the paste data will be inserted.) textBufferPasteClipboardAtCursor :: TextBufferClass self => self-  -> Clipboard  -- ^ @clipboard@ - 	the GtkClipboard to paste from+  -> Clipboard  -- ^ @clipboard@ -      the GtkClipboard to paste from   -> Bool       -- ^ @defaultEditable@ -   whether the buffer is editable by default   -> IO () textBufferPasteClipboardAtCursor self clipboard defaultEditable =@@ -1149,7 +1149,7 @@  -- | Copies the currently-selected text to a clipboard. textBufferCopyClipboard :: TextBufferClass self => self-  -> Clipboard -- ^ @clipboard@ - 	the GtkClipboard object to copy to+  -> Clipboard -- ^ @clipboard@ -       the GtkClipboard object to copy to   -> IO () textBufferCopyClipboard self clipboard =   {# call gtk_text_buffer_copy_clipboard #}@@ -1159,7 +1159,7 @@ -- | Copies the currently-selected text to a clipboard, -- then deletes said text if it's editable. textBufferCutClipboard :: TextBufferClass self => self-  -> Clipboard  -- ^ @clipboard@ - 	the GtkClipboard object to cut to+  -> Clipboard  -- ^ @clipboard@ -      the GtkClipboard object to cut to   -> Bool       -- ^ @defaultEditable@ -   whether the buffer is editable by default   -> IO () textBufferCutClipboard self clipboard defaultEditable =@@ -1173,7 +1173,7 @@ -- In most cases, @clipboard@ will be the 'Clipboard' of type 'selectionPrimary' for a view of @self@. -- textBufferAddSelectionClipboard :: TextBufferClass self => self- -> Clipboard  -- ^ @clipboard@ - 	the 'Clipboard' object to add+ -> Clipboard  -- ^ @clipboard@ -       the 'Clipboard' object to add  -> IO () textBufferAddSelectionClipboard self clipboard =   {# call text_buffer_add_selection_clipboard #} (toTextBuffer self) clipboard

Graphics/UI/Gtk/Multiline/TextIter.chs view

@@ -138,17 +138,17 @@   textIterLine,   ) where -import Control.Monad	(liftM)-import Data.Maybe	(fromMaybe)-import Data.Char	(chr)+import Control.Monad    (liftM)+import Data.Maybe       (fromMaybe)+import Data.Char        (chr)  import System.Glib.FFI-import System.Glib.Flags		(fromFlags)+import System.Glib.Flags                (fromFlags) import System.Glib.UTFString import System.Glib.Attributes import System.Glib.GList {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.General.Enums	(TextSearchFlags(..))+import Graphics.UI.Gtk.General.Enums    (TextSearchFlags(..)) {#import Graphics.UI.Gtk.Multiline.Types#} {#import Graphics.UI.Gtk.Multiline.TextTag#} {#import Graphics.Rendering.Pango.BasicTypes#}@@ -1040,8 +1040,8 @@   res <- {#call unsafe text_iter_compare#} ti1 ti2   return $ case res of     (-1)   -> LT-    0	   -> EQ-    1	   -> GT+    0      -> EQ+    1      -> GT  -- | Checks whether iter falls in the range [start, end). -- start and end must be in ascending order.

Graphics/UI/Gtk/Multiline/TextMark.chs view

@@ -85,7 +85,7 @@   textMarkLeftGravity   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString

Graphics/UI/Gtk/Multiline/TextTag.chs view

@@ -154,7 +154,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString@@ -164,14 +164,14 @@ {#import Graphics.UI.Gtk.Signals#} import Graphics.Rendering.Pango.Font import Graphics.Rendering.Pango.BasicTypes      (FontDescription (..), makeNewFontDescription)-import Graphics.Rendering.Pango.Enums	(FontStyle(..), Variant(..),-					 Stretch(..), Underline(..))-import Graphics.UI.Gtk.General.Enums	(TextDirection(..),-					 Justification(..), WrapMode(..))+import Graphics.Rendering.Pango.Enums   (FontStyle(..), Variant(..),+                                         Stretch(..), Underline(..))+import Graphics.UI.Gtk.General.Enums    (TextDirection(..),+                                         Justification(..), WrapMode(..)) import Graphics.UI.Gtk.General.Structs  (Color(..)) import Graphics.UI.Gtk.Multiline.Types  ( TextIter, mkTextIterCopy ) #ifndef DISABLE_DEPRECATED-import Graphics.UI.Gtk.Gdk.Events	(Event, marshalEvent)+import Graphics.UI.Gtk.Gdk.Events       (Event, marshalEvent) #endif import Graphics.UI.Gtk.Gdk.EventM (EventM, EAny) import Control.Monad.Reader ( runReaderT )@@ -784,7 +784,7 @@ --   e.g. mouse clicks to implement hyperlinking. -- onTextTagEvent :: TextTagClass t => t -> (Event -> TextIter -> IO ()) ->-		  IO (ConnectId t)+                  IO (ConnectId t) onTextTagEvent tt act =   connect_PTR_BOXED_BOXED__BOOL "event" marshalEvent mkTextIterCopy False tt     (\_ event iter -> act event iter >> return False)

Graphics/UI/Gtk/Multiline/TextTagTable.chs view

@@ -56,7 +56,7 @@   textTagTableGetSize   ) where -import Control.Monad	(liftM, void)+import Control.Monad    (liftM, void)  import System.Glib.FFI (withForeignPtr, nullPtr, Ptr(..), CInt(..), CChar(..), FunPtr(..), maybeNull) import System.Glib.UTFString

Graphics/UI/Gtk/Multiline/TextView.chs view

@@ -188,26 +188,26 @@   textViewPreeditChanged   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties           (newAttrFromStringProperty)-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)-import Graphics.UI.Gtk.Gdk.EventM	(EventM, EKey)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject)+import Graphics.UI.Gtk.Gdk.EventM       (EventM, EKey) import Control.Monad.Reader             ( ask ) import Control.Monad.Trans              ( liftIO ) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} {#import Graphics.UI.Gtk.Multiline.Types#} {#import Graphics.UI.Gtk.Multiline.TextTag#}-import Graphics.UI.Gtk.General.Enums	(TextWindowType(..), DeleteType(..),-					 DirectionType(..), Justification(..),-					 MovementStep(..), WrapMode(..),+import Graphics.UI.Gtk.General.Enums    (TextWindowType(..), DeleteType(..),+                                         DirectionType(..), Justification(..),+                                         MovementStep(..), WrapMode(..),                                          ScrollStep (..))-import System.Glib.GList		(fromGList)-import Graphics.UI.Gtk.General.Structs	(Rectangle(..))+import System.Glib.GList                (fromGList)+import Graphics.UI.Gtk.General.Structs  (Rectangle(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Multiline/Types.chs view

@@ -32,7 +32,7 @@   ) where  import System.Glib.FFI-import Graphics.UI.Gtk.General.Structs	(textIterSize)+import Graphics.UI.Gtk.General.Structs  (textIterSize)  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Ornaments/Frame.chs view

@@ -73,15 +73,15 @@   frameLabelWidget,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.General.Enums	(ShadowType(..))+import Graphics.UI.Gtk.General.Enums    (ShadowType(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Ornaments/HSeparator.chs view

@@ -52,10 +52,10 @@   hSeparatorNew,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Ornaments/VSeparator.chs view

@@ -52,10 +52,10 @@   vSeparatorNew,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Printing/PageSetup.chs view

@@ -98,7 +98,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.GError

Graphics/UI/Gtk/Printing/PaperSize.chs view

@@ -75,7 +75,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString

Graphics/UI/Gtk/Printing/PrintContext.chs view

@@ -74,7 +74,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM) import Data.IORef (newIORef)  import System.Glib.FFI

Graphics/UI/Gtk/Printing/PrintOperation.chs view

@@ -160,7 +160,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes

Graphics/UI/Gtk/Printing/PrintSettings.chs view

@@ -142,7 +142,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes

Graphics/UI/Gtk/Recent/RecentChooser.chs view

@@ -91,7 +91,7 @@  #if GTK_CHECK_VERSION(2,10,0) -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString@@ -99,7 +99,7 @@ import System.Glib.Properties import System.Glib.GList import System.Glib.GError   (checkGError)-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Recent.RecentInfo#} (RecentInfo, mkRecentInfo) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Recent/RecentChooserMenu.chs view

@@ -79,12 +79,12 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Recent/RecentChooserWidget.chs view

@@ -69,11 +69,11 @@  #if GTK_CHECK_VERSION(2,10,0) -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject)  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Recent/RecentFilter.chs view

@@ -88,7 +88,7 @@  import System.Glib.FFI import System.Glib.UTFString-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Recent/RecentInfo.chs view

@@ -58,7 +58,7 @@  #if GTK_CHECK_VERSION(2,10,0) -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString

Graphics/UI/Gtk/Recent/RecentManager.chs view

@@ -91,7 +91,7 @@  #if GTK_CHECK_VERSION(2,10,0) -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes

Graphics/UI/Gtk/Scrolling/HScrollbar.chs view

@@ -58,10 +58,10 @@   hScrollbarNewDefaults   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs view

@@ -131,15 +131,15 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM) import Data.Maybe    (fromMaybe)  import System.Glib.FFI import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.General.Enums	(PolicyType(..), CornerType(..), ShadowType(..))+import Graphics.UI.Gtk.General.Enums    (PolicyType(..), CornerType(..), ShadowType(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Scrolling/VScrollbar.chs view

@@ -58,10 +58,10 @@   vScrollbarNewDefaults   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Selectors/ColorButton.chs view

@@ -78,15 +78,15 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}-import Graphics.UI.Gtk.General.Structs	(Color)+import Graphics.UI.Gtk.General.Structs  (Color)  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Selectors/ColorSelection.chs view

@@ -76,11 +76,11 @@   colorSelectionPreviousAlpha,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} import Graphics.UI.Gtk.General.Structs (Color)

Graphics/UI/Gtk/Selectors/ColorSelectionDialog.chs view

@@ -63,17 +63,17 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} #if GTK_MAJOR_VERSION < 3-import Graphics.UI.Gtk.General.Structs	(colorSelectionDialogGetColor,-					colorSelectionDialogGetOkButton,-					colorSelectionDialogGetCancelButton,-					colorSelectionDialogGetHelpButton)+import Graphics.UI.Gtk.General.Structs  (colorSelectionDialogGetColor,+                                        colorSelectionDialogGetOkButton,+                                        colorSelectionDialogGetCancelButton,+                                        colorSelectionDialogGetHelpButton) #endif  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Selectors/FileChooser.chs view

@@ -98,22 +98,22 @@ -- following fragment in your .gtkrc-2.0 file: -- -- > binding "my-own-gtkfilechooser-bindings" {--- > 	bind "AltShiftl" {--- > 		"location-popup" ()--- > 	}--- > 	bind "AltShiftUp" {--- > 		"up-folder" ()--- > 	}--- > 	bind "AltShiftDown" {--- > 		"down-folder" ()--- > 	}--- > 	bind "AltShiftHome" {--- > 		"home-folder-folder" ()--- > 	}+-- >    bind "AltShiftl" {+-- >            "location-popup" ()+-- >    }+-- >    bind "AltShiftUp" {+-- >            "up-folder" ()+-- >    }+-- >    bind "AltShiftDown" {+-- >            "down-folder" ()+-- >    }+-- >    bind "AltShiftHome" {+-- >            "home-folder-folder" ()+-- >    } -- > } -- > -- > class "GtkFileChooserDefault" binding "my-own-gtkfilechooser-bindings"--- > 	+-- >     --  -- * Class Hierarchy@@ -239,10 +239,10 @@ import System.Glib.UTFString import System.Glib.Attributes {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) import Graphics.UI.Gtk.Signals {#import System.Glib.GList#}-import System.Glib.GError		(propagateGError, GErrorDomain, GErrorClass(..))+import System.Glib.GError               (propagateGError, GErrorDomain, GErrorClass(..))  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Selectors/FileChooserButton.chs view

@@ -78,13 +78,13 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  #if GTK_CHECK_VERSION(2,6,0)

Graphics/UI/Gtk/Selectors/FileChooserDialog.chs view

@@ -83,8 +83,8 @@ import Graphics.UI.Gtk.Abstract.Object (makeNewObject) import Graphics.UI.Gtk.Windows.Window import Graphics.UI.Gtk.Windows.Dialog-import System.Glib.GValue		(allocaGValue)-import System.Glib.GValueTypes		(valueSetMaybeString)+import System.Glib.GValue               (allocaGValue)+import System.Glib.GValueTypes          (valueSetMaybeString) import System.Glib.Attributes  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Selectors/FileFilter.chs view

@@ -78,14 +78,14 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import System.Glib.Flags		(Flags, fromFlags)+import System.Glib.Flags                (Flags, fromFlags) import System.Glib.UTFString import System.Glib.Attributes {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject)  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Selectors/FileSelection.chs view

@@ -100,8 +100,8 @@ import System.Glib.Attributes import System.Glib.Properties {#import Graphics.UI.Gtk.Types#}-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)-import Graphics.UI.Gtk.General.Structs	(fileSelectionGetButtons)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject)+import Graphics.UI.Gtk.General.Structs  (fileSelectionGetButtons)  {# context lib="libgtk" prefix="gtk" #}

Graphics/UI/Gtk/Selectors/FontButton.chs view

@@ -85,13 +85,13 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Selectors/FontSelection.chs view

@@ -72,13 +72,13 @@   fontSelectionPreviewText,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Selectors/FontSelectionDialog.chs view

@@ -77,12 +77,12 @@   fontSelectionDialogPreviewText,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Selectors/HSV.chs view

@@ -71,12 +71,12 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.Attributes-import Graphics.UI.Gtk.General.Enums	(DirectionType (..))-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.General.Enums    (DirectionType (..))+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Signals#} {#import Graphics.UI.Gtk.Types#}

Graphics/UI/Gtk/Signals.chs view

@@ -107,7 +107,7 @@      ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString   (peekUTFString,maybePeekUTFString)

Graphics/UI/Gtk/Special/HRuler.chs view

@@ -59,10 +59,10 @@ #endif   ) where #if GTK_MAJOR_VERSION < 3-import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-{#import Graphics.UI.Gtk.Abstract.Object#}	(makeNewObject)+{#import Graphics.UI.Gtk.Abstract.Object#}      (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Special/VRuler.chs view

@@ -60,10 +60,10 @@ #endif   ) where #if GTK_MAJOR_VERSION < 3-import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-{#import Graphics.UI.Gtk.Abstract.Object#}	(makeNewObject)+{#import Graphics.UI.Gtk.Abstract.Object#}      (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Windows/AboutDialog.chs view

@@ -140,14 +140,14 @@ #endif   ) where -import Control.Monad	(liftM)-import Data.Maybe	(fromMaybe)+import Control.Monad    (liftM)+import Data.Maybe       (fromMaybe)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#}  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Windows/Assistant.chs view

@@ -111,13 +111,13 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#}

Graphics/UI/Gtk/Windows/Dialog.chs view

@@ -56,7 +56,7 @@ -- pass the 'DialogModal' flag to make a dialog modal. -- -- If you add buttons to 'Dialog' using 'dialogNewWithButtons',--- 'dialogAddButton', 'dialogAddButtons', or 'dialogAddActionWidget', clicking+-- 'dialogAddButton', or 'dialogAddActionWidget', clicking -- the button will emit a signal called \"response\" with a response ID that -- you specified. Gtk+ will never assign a meaning to positive response IDs; -- these are entirely user-defined. But for convenience, you can use the@@ -148,20 +148,20 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) {#import Graphics.UI.Gtk.Types#} {#import Graphics.UI.Gtk.Signals#} import Graphics.UI.Gtk.General.Structs ( #if GTK_MAJOR_VERSION < 3                     dialogGetUpper, dialogGetActionArea, #endif-					ResponseId(..), fromResponse, toResponse)+                                        ResponseId(..), fromResponse, toResponse)  {# context lib="gtk" prefix="gtk" #}

Graphics/UI/Gtk/Windows/Invisible.chs view

@@ -49,10 +49,10 @@   invisibleGetScreen,   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject) import Graphics.UI.Gtk.Gdk.Screen {#import Graphics.UI.Gtk.Types#}

Graphics/UI/Gtk/Windows/MessageDialog.chs view

@@ -94,15 +94,15 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI {#import Graphics.UI.Gtk.Types#} import System.Glib.UTFString import System.Glib.Attributes import System.Glib.Properties-import System.Glib.Flags	(Flags, fromFlags)-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)+import System.Glib.Flags        (Flags, fromFlags)+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject)  {# context lib="gtk" prefix="gtk" #} @@ -122,7 +122,7 @@ -- | Specify what buttons this dialog should show. -- -- * Prebuilt sets of buttons for the dialog. If none of these choices---   are appropriate, simply use 'ButtonsNone' then call 'dialogAddButtons'.+--   are appropriate, simply use 'ButtonsNone' then call 'dialogAddButton'. -- {#enum ButtonsType {underscoreToCase} deriving(Show,Eq)#} @@ -162,11 +162,11 @@   makeNewObject mkMessageDialog $   liftM (castPtr :: Ptr Widget -> Ptr MessageDialog) $   call_message_dialog_new mWindow flags mType bType msgPtr-	  			-	  			+                                +                                 call_message_dialog_new :: Maybe Window -> [DialogFlags] ->-			   MessageType -> ButtonsType -> Ptr CChar ->-			   IO (Ptr Widget)+                           MessageType -> ButtonsType -> Ptr CChar ->+                           IO (Ptr Widget) call_message_dialog_new (Just (Window fPtr)) flags mType bType msgPtr =   withForeignPtr fPtr $ \ptr ->     message_dialog_new ptr (fromIntegral (fromFlags flags))@@ -179,7 +179,7 @@  foreign import ccall unsafe "gtk_message_dialog_new"   message_dialog_new :: Ptr Window -> CInt -> CInt -> CInt ->-		        Ptr CChar -> IO (Ptr Widget)+                        Ptr CChar -> IO (Ptr Widget)  #if GTK_CHECK_VERSION(2,4,0) -- | Creates a new message dialog, which is a simple dialog with an icon@@ -237,8 +237,8 @@  foreign import ccall unsafe "gtk_message_dialog_format_secondary_markup"   message_dialog_format_secondary_markup :: Ptr MessageDialog ->-  					   Ptr CChar -> IO ()-  					+                                           Ptr CChar -> IO ()+                                         messageDialogSetSecondaryText :: (MessageDialogClass self, GlibString string) => self  -> string -- ^ @str@ - text to be shown as second line  -> IO ()@@ -250,7 +250,7 @@  foreign import ccall unsafe "gtk_message_dialog_format_secondary_text"   message_dialog_format_secondary_text :: Ptr MessageDialog ->- 					 Ptr CChar -> IO ()+                                         Ptr CChar -> IO ()  #if GTK_CHECK_VERSION(2,10,0) -- %hash c:6cb7 d:ebdd

Graphics/UI/Gtk/Windows/OffscreenWindow.chs view

@@ -74,7 +74,7 @@ #endif ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import Graphics.UI.Gtk.Abstract.Object   (makeNewObject)

Graphics/UI/Gtk/Windows/Window.chs view

@@ -277,7 +277,7 @@ #endif   ) where -import Control.Monad	(liftM)+import Control.Monad    (liftM)  import System.Glib.FFI import System.Glib.UTFString@@ -286,8 +286,8 @@ import System.Glib.Attributes import System.Glib.Properties import System.Glib.GList                (fromGList, withGList)-import Graphics.UI.Gtk.Abstract.Object	(makeNewObject)-import Graphics.UI.Gtk.General.Enums	(WindowType(..), WindowPosition(..))+import Graphics.UI.Gtk.Abstract.Object  (makeNewObject)+import Graphics.UI.Gtk.General.Enums    (WindowType(..), WindowPosition(..)) #if GTK_MAJOR_VERSION < 3 import Graphics.UI.Gtk.General.Structs  (windowGetFrame) #endif@@ -295,11 +295,11 @@ {#import Graphics.UI.Gtk.Signals#} {#import Graphics.UI.Gtk.Gdk.Enums#}    (Modifier(..)) {#import Graphics.UI.Gtk.Gdk.Keys#}     (KeyVal)-import Graphics.UI.Gtk.Gdk.EventM	(EventM, EAny, EKey, MouseButton, TimeStamp)+import Graphics.UI.Gtk.Gdk.EventM       (EventM, EAny, EKey, MouseButton, TimeStamp) import Control.Monad.Reader             ( runReaderT, ask ) import Control.Monad.Trans              ( liftIO )-import Graphics.UI.Gtk.Gdk.Enums	(WindowEdge(..), WindowTypeHint(..),-					Gravity(..))+import Graphics.UI.Gtk.Gdk.Enums        (WindowEdge(..), WindowTypeHint(..),+                                        Gravity(..))  {# context lib="gtk" prefix="gtk" #}

demo/carsim/CarSim.hs view

@@ -4,6 +4,10 @@ -- license: public domain  module Main where++import Control.Applicative+import Prelude+ import Data.Maybe import Graphics.UI.Gtk import Graphics.Rendering.Cairo@@ -12,7 +16,6 @@ import Data.List import Data.Time import Data.Complex-import Control.Applicative ((<$>))  -- Constants

demo/concurrent/Progress.hs view

@@ -8,8 +8,9 @@  import Graphics.UI.Gtk +import Control.Applicative+import Prelude import Control.Concurrent-import Control.Applicative ((<$>))  main :: IO () main = do

demo/concurrent/ProgressThreadedRTS.hs view

@@ -10,8 +10,9 @@  import Graphics.UI.Gtk +import Control.Applicative+import Prelude import Control.Concurrent-import Control.Applicative ((<$>))  main :: IO () main = do

demo/fastdraw/FastDraw.hs view

@@ -4,13 +4,14 @@ -- Example of an drawing graphics onto a canvas. import Graphics.UI.Gtk +import Control.Applicative+import Prelude import Data.IORef import Graphics.Rendering.Cairo import Foreign (allocaArray) import Graphics.Rendering.Cairo.Types (PixelData) import Foreign.Storable (Storable(..)) import Foreign.C (CUChar)-import Control.Applicative ((<$>))   main = do

demo/unicode/Arabic.hs view

@@ -1,9 +1,10 @@ -- Example of an international dialog box. import Graphics.UI.Gtk +import Control.Applicative+import Prelude import Data.Char import qualified Data.Text as T-import Control.Applicative import Data.Text (Text)  main :: IO ()

gtk.cabal view

@@ -1,5 +1,5 @@ Name:           gtk-Version:        0.13.7+Version:        0.13.8 License:        LGPL-2.1 License-file:   COPYING Copyright:      (c) 2001-2010 The Gtk2Hs Team@@ -147,7 +147,7 @@         if flag(have-quartz-gtk)           cpp-options:    -DHAVE_QUARTZ_GTK -        build-tools:    gtk2hsC2hs >= 0.13.12,+        build-tools:    gtk2hsC2hs >= 0.13.13,                         gtk2hsHookGenerator, gtk2hsTypeGen          exposed-modules: