From 2b0c844e1557d8efd74dfde6b21996c6c72b0fdc Mon Sep 17 00:00:00 2001 From: Harri Nieminen Date: Fri, 31 Mar 2023 17:52:24 +0300 Subject: [PATCH] fix typos --- APICHANGES | 4 +- INSTALL | 2 +- OLD_TODO | 2 +- cairo/Graphics/Rendering/Cairo.hs | 22 ++++----- .../Internal/Drawing/Transformations.chs | 2 +- docs/tools/AddLinks.hs | 2 +- docs/tutorial/Tutorial_Port/app1.xhtml | 6 +-- docs/tutorial/Tutorial_Port/chap4-6.xhtml | 2 +- docs/tutorial/Tutorial_Port/chap4-7.xhtml | 2 +- docs/tutorial/Tutorial_Port/chap5-2.xhtml | 4 +- docs/tutorial/Tutorial_Port/chap5-4.xhtml | 2 +- docs/tutorial/Tutorial_Port/es-app1.xhtml | 2 +- docs/tutorial/intro/index.t2t | 6 +-- docs/tutorial/tutorial.t2t | 2 +- gio/System/GIO/Async/Cancellable.chs | 2 +- gio/System/GIO/File/AppInfo.chs | 4 +- gio/System/GIO/File/ContentType.chs | 2 +- gio/System/GIO/File/File.chs | 4 +- gio/System/GIO/File/FileAttribute.hsc | 4 +- gio/System/GIO/File/FileInfo.chs | 2 +- gio/System/GIO/Volumes/Drive.chs | 16 +++---- gio/System/GIO/Volumes/Mount.chs | 2 +- gio/System/GIO/Volumes/Volume.chs | 4 +- gio/hierarchy.list | 4 +- glib/System/Glib/GError.chs | 10 ++-- glib/System/Glib/GObject.chs | 6 +-- glib/System/Glib/Signals.chs | 6 +-- glib/System/Glib/hsgclosure.c | 2 +- gtk/Graphics/UI/Gtk/Abstract/Box.chs | 6 +-- gtk/Graphics/UI/Gtk/Abstract/ButtonBox.chs | 2 +- gtk/Graphics/UI/Gtk/Abstract/Container.chs | 2 +- gtk/Graphics/UI/Gtk/Abstract/Object.chs | 2 +- gtk/Graphics/UI/Gtk/Abstract/Paned.chs | 2 +- gtk/Graphics/UI/Gtk/Abstract/Range.chs | 6 +-- gtk/Graphics/UI/Gtk/Abstract/Widget.chs | 22 ++++----- .../UI/Gtk/ActionMenuToolbar/ActionGroup.chs | 6 +-- .../UI/Gtk/ActionMenuToolbar/RadioAction.chs | 2 +- .../UI/Gtk/ActionMenuToolbar/UIManager.chs | 2 +- gtk/Graphics/UI/Gtk/Buttons/Button.chs | 2 +- gtk/Graphics/UI/Gtk/Buttons/RadioButton.chs | 6 +-- gtk/Graphics/UI/Gtk/Display/Label.chs | 4 +- gtk/Graphics/UI/Gtk/Display/LevelBar.chs | 2 +- gtk/Graphics/UI/Gtk/Display/ProgressBar.chs | 2 +- gtk/Graphics/UI/Gtk/Embedding/Plug.chs | 2 +- gtk/Graphics/UI/Gtk/Entry/Editable.chs | 4 +- gtk/Graphics/UI/Gtk/Entry/Entry.chs | 2 +- gtk/Graphics/UI/Gtk/Gdk/Cursor.chs | 2 +- gtk/Graphics/UI/Gtk/Gdk/Display.chs | 14 +++--- gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs | 2 +- gtk/Graphics/UI/Gtk/Gdk/Drawable.chs | 2 +- gtk/Graphics/UI/Gtk/Gdk/Enums.chs | 4 +- gtk/Graphics/UI/Gtk/Gdk/EventM.hsc | 4 +- gtk/Graphics/UI/Gtk/Gdk/Events.hsc | 6 +-- gtk/Graphics/UI/Gtk/Gdk/GC.chs | 2 +- gtk/Graphics/UI/Gtk/Gdk/GLContext.chs | 2 +- gtk/Graphics/UI/Gtk/Gdk/Gdk.chs | 2 +- gtk/Graphics/UI/Gtk/Gdk/Keymap.chs | 2 +- gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs | 10 ++-- gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs | 2 +- gtk/Graphics/UI/Gtk/Gdk/Screen.chs | 2 +- gtk/Graphics/UI/Gtk/General/Drag.chs | 6 +-- gtk/Graphics/UI/Gtk/General/Enums.chs | 8 ++-- gtk/Graphics/UI/Gtk/General/General.chs | 4 +- gtk/Graphics/UI/Gtk/General/IconFactory.chs | 4 +- gtk/Graphics/UI/Gtk/General/IconTheme.chs | 2 +- gtk/Graphics/UI/Gtk/General/RcStyle.chs | 8 ++-- gtk/Graphics/UI/Gtk/General/Selection.chs | 2 +- gtk/Graphics/UI/Gtk/General/Structs.hsc | 6 +-- gtk/Graphics/UI/Gtk/General/StyleProvider.chs | 2 +- gtk/Graphics/UI/Gtk/General/hsgthread.c | 2 +- gtk/Graphics/UI/Gtk/Layout/Overlay.chs | 2 +- gtk/Graphics/UI/Gtk/Layout/Stack.chs | 2 +- gtk/Graphics/UI/Gtk/Layout/Table.chs | 2 +- .../UI/Gtk/MenuComboToolbar/CheckMenuItem.chs | 2 +- .../UI/Gtk/MenuComboToolbar/ComboBox.chs | 2 +- .../UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs | 4 +- gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs | 6 +-- .../UI/Gtk/MenuComboToolbar/MenuItem.chs | 6 +-- .../UI/Gtk/MenuComboToolbar/MenuShell.chs | 2 +- .../UI/Gtk/MenuComboToolbar/RadioMenuItem.chs | 2 +- .../UI/Gtk/MenuComboToolbar/ToolItemGroup.chs | 2 +- .../UI/Gtk/MenuComboToolbar/Toolbar.chs | 10 ++-- gtk/Graphics/UI/Gtk/Misc/Arrow.chs | 4 +- gtk/Graphics/UI/Gtk/Misc/GLArea.chs | 2 +- gtk/Graphics/UI/Gtk/Misc/HandleBox.chs | 6 +-- gtk/Graphics/UI/Gtk/Misc/Switch.chs | 2 +- gtk/Graphics/UI/Gtk/Misc/Tooltips.chs | 2 +- .../UI/Gtk/ModelView/CellRenderer.chs | 2 +- .../UI/Gtk/ModelView/CellRendererText.chs | 2 +- gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs | 8 ++-- gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c | 2 +- gtk/Graphics/UI/Gtk/ModelView/IconView.chs | 4 +- gtk/Graphics/UI/Gtk/ModelView/ListStore.hs | 6 +-- .../UI/Gtk/ModelView/TreeSelection.chs | 2 +- gtk/Graphics/UI/Gtk/ModelView/TreeStore.hs | 6 +-- gtk/Graphics/UI/Gtk/ModelView/TreeView.chs | 18 ++++---- .../UI/Gtk/ModelView/TreeViewColumn.chs | 2 +- gtk/Graphics/UI/Gtk/Multiline/TextIter.chs | 46 +++++++++---------- gtk/Graphics/UI/Gtk/Multiline/TextMark.chs | 2 +- gtk/Graphics/UI/Gtk/Multiline/TextTag.chs | 2 +- gtk/Graphics/UI/Gtk/Multiline/TextView.chs | 10 ++-- gtk/Graphics/UI/Gtk/Multiline/Types.chs | 2 +- gtk/Graphics/UI/Gtk/Ornaments/Frame.chs | 2 +- .../UI/Gtk/Printing/PrintOperation.chs | 6 +-- gtk/Graphics/UI/Gtk/Recent/RecentChooser.chs | 4 +- gtk/Graphics/UI/Gtk/Recent/RecentManager.chs | 4 +- .../UI/Gtk/Scrolling/ScrolledWindow.chs | 2 +- .../UI/Gtk/Selectors/ColorSelection.chs | 2 +- gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs | 2 +- gtk/Graphics/UI/Gtk/Windows/Assistant.chs | 2 +- gtk/Graphics/UI/Gtk/Windows/Window.chs | 6 +-- gtk/demo/buttonbox/ButtonBox.hs | 4 +- gtk/demo/carsim/CarSim.hs | 2 +- gtk/demo/concurrent/ProgressThreadedRTS.hs | 2 +- gtk/demo/gtkbuilder/GtkBuilderTest.hs | 2 +- gtk/demo/overlay/Overlay.hs | 6 +-- gtk/gtk.cabal-renamed | 2 +- gtk/gtk3.cabal | 2 +- gtk/hierarchy.list | 4 +- gtk/hierarchy3.list | 4 +- gtk/hsgtk.h | 2 +- pango/Graphics/Rendering/Pango/BasicTypes.chs | 2 +- .../Graphics/Rendering/Pango/Description.chs | 8 ++-- .../Graphics/Rendering/Pango/GlyphStorage.chs | 2 +- pango/Graphics/Rendering/Pango/Layout.chs | 14 +++--- pango/Graphics/Rendering/Pango/Rendering.chs | 2 +- pango/Graphics/Rendering/Pango/Structs.hsc | 2 +- pango/hierarchy.list | 4 +- tools/apiGen/src/AddDocs.hs | 2 +- tools/apiGen/src/ApiGen.hs | 2 +- tools/apiGen/src/Docs.hs | 2 +- tools/apiGen/src/HaddockDocs.hs | 2 +- tools/apiGen/src/Marshal.hs | 6 +-- tools/apiGen/src/MarshalFixup.hs | 4 +- tools/apiGen/src/Module.hs | 2 +- tools/apicoverage/Makefile | 2 +- tools/apicoverage/README | 2 +- tools/apidiff/ghc-pkg-apidump.sh | 2 +- tools/c2hs/base/TODO | 4 +- tools/c2hs/base/admin/Config.hs | 2 +- tools/c2hs/base/errors/Errors.hs | 4 +- tools/c2hs/base/general/Binary.hs | 6 +-- tools/c2hs/base/general/FileOps.hs | 2 +- tools/c2hs/base/general/UNames.hs | 6 +-- tools/c2hs/base/state/StateBase.hs | 2 +- tools/c2hs/base/state/StateTrans.hs | 8 ++-- tools/c2hs/base/syms/Attributes.hs | 4 +- tools/c2hs/base/syms/NameSpaces.hs | 14 +++--- tools/c2hs/base/syms/tests/Main.hs | 2 +- tools/c2hs/base/syntax/Lexers.hs | 4 +- tools/c2hs/c/CAST.hs | 2 +- tools/c2hs/c/CAttrs.hs | 2 +- tools/c2hs/c/CNames.hs | 4 +- tools/c2hs/c/CParser.y | 6 +-- tools/c2hs/c/CParserMonad.hs | 2 +- tools/c2hs/c/CPretty.hs | 2 +- tools/c2hs/c/CTrav.hs | 16 +++---- tools/c2hs/chs/CHS.hs | 8 ++-- tools/c2hs/chs/CHSLexer.hs | 6 +-- tools/c2hs/config.guess | 2 +- tools/c2hs/doc/base/base.tex | 34 +++++++------- tools/c2hs/doc/c2hs/c2hs.sgml | 12 ++--- tools/c2hs/doc/c2hs/lib/CString.hs | 2 +- tools/c2hs/doc/c2hs/lib/ForeignPtr.hs | 2 +- tools/c2hs/doc/c2hs/lib/MarshalAlloc.hs | 2 +- tools/c2hs/doc/c2hs/lib/MarshalUtils.hs | 2 +- tools/c2hs/gen/GBMonad.hs | 2 +- tools/c2hs/gen/GenBind.hs | 14 +++--- tools/c2hs/mk/common.mk | 2 +- tools/c2hs/toplevel/Gtk2HsC2Hs.hs | 10 ++-- tools/c2hs/toplevel/c2hs_config.c | 2 +- tools/hierarchyGen/TypeGen.hs | 2 +- tools/hierarchyGen/hierarchy.list | 4 +- tools/src/Gtk2HsSetup.hs | 2 +- tools/win32/gtk2hs.iss | 6 +-- tools/win32/prune.sh | 2 +- 176 files changed, 402 insertions(+), 402 deletions(-) diff --git a/APICHANGES b/APICHANGES index 7ac454fec..98805bfe1 100644 --- a/APICHANGES +++ b/APICHANGES @@ -6,7 +6,7 @@ renamed all the Event record member names after 0.9.7 -idle priorities now have right names. See eg progrss demo for how to change the code. +idle priorities now have right names. See eg progress demo for how to change the code. treeViewSetHadjustment, treeViewSetHadjustment, treeViewSetHadjustment, treeViewSetHadjustment all renamed and the set ones @@ -20,7 +20,7 @@ type will break if X servers should ever support more than 5 buttons. Events.hsc: removed several constructors, change the Key event. -General.chs: changed the priorty constants +General.chs: changed the priority constants Bin.chs: make binGetChild return Maybe diff --git a/INSTALL b/INSTALL index 613de90f4..c3d00e3a9 100644 --- a/INSTALL +++ b/INSTALL @@ -114,7 +114,7 @@ If you are using Stack and list "gtk" as a build dependency in your *.cabal file * pango-devel * gtk2-devel -This way you won't have to add cabal directory to your $PATH. Skipping cabal configuration and letting Stack manage all dependencies will save you a lot ot time. +This way you won't have to add cabal directory to your $PATH. Skipping cabal configuration and letting Stack manage all dependencies will save you a lot of time. === Installing darcs === There are binaries available on [http://darcs.net/Binaries the official download page], or in almost all cases via your package manager as a package named darcs. diff --git a/OLD_TODO b/OLD_TODO index 38e6f98e5..735b7b910 100644 --- a/OLD_TODO +++ b/OLD_TODO @@ -79,7 +79,7 @@ TODO for gtk2hs 8/12/2004 Duncan Coutts - * there sould be a rule to rebuild .chi files even if the corresponding + * there should be a rule to rebuild .chi files even if the corresponding .hs file still exists. Otherwise the build can stick and you have to delete the .hs file to unstick it. Each .chs file should depend on the .hs file and (or perhaps instead of) the .chi file. diff --git a/cairo/Graphics/Rendering/Cairo.hs b/cairo/Graphics/Rendering/Cairo.hs index 3290f388a..b6911f803 100644 --- a/cairo/Graphics/Rendering/Cairo.hs +++ b/cairo/Graphics/Rendering/Cairo.hs @@ -488,7 +488,7 @@ popGroupToSource = liftRender0 Internal.popGroupToSource setSourceRGB :: Double -- ^ red component of colour -> Double -- ^ green component of colour - -> Double -- ^ blue compoment of colour + -> Double -- ^ blue component of colour -> Render () setSourceRGB = liftRender3 Internal.setSourceRGB @@ -568,7 +568,7 @@ getAntialias = liftRender0 Internal.getAntialias -- | Sets the dash pattern to be used by 'stroke'. A dash pattern is specified -- by dashes, a list of positive values. Each value provides the user-space --- length of altenate "on" and "off" portions of the stroke. The offset +-- length of alternate "on" and "off" portions of the stroke. The offset -- specifies an offset into the pattern at which the stroke begins. -- -- If @dashes@ is @[]@ then dashing is disabled. @@ -1232,7 +1232,7 @@ withLinearPattern x0 y0 x1 y1 f = withRadialPattern :: Double -- ^ @cx0@ - x coordinate for the center of the start circle -> Double -- ^ @cy0@ - y coordinate for the center of the start circle - -> Double -- ^ @radius0@ - radius of the start cirle + -> Double -- ^ @radius0@ - radius of the start circle -> Double -- ^ @cx1@ - x coordinate for the center of the end circle -> Double -- ^ @cy1@ - y coordinate for the center of the end circle -> Double -- ^ @radius1@ - radius of the end circle @@ -1531,7 +1531,7 @@ meshPatternGetPatchCount :: -> m (Status, Int) meshPatternGetPatchCount p = liftIO$ Internal.meshPatternGetPatchCount p --- | Gets path defining a spedified patch from a mesh pattern. +-- | Gets path defining a specified patch from a mesh pattern. -- -- qv meshPatternGetPath :: @@ -1812,7 +1812,7 @@ fontOptionsEqual a b = liftIO $ Internal.fontOptionsEqual a b fontOptionsSetAntialias :: MonadIO m => FontOptions -> Antialias -> m () fontOptionsSetAntialias a b = liftIO $ Internal.fontOptionsSetAntialias a b --- | Gets the antialising mode for the font options object. +-- | Gets the antialiasing mode for the font options object. -- fontOptionsGetAntialias :: MonadIO m => FontOptions -> m Antialias fontOptionsGetAntialias a = liftIO $ Internal.fontOptionsGetAntialias a @@ -1880,7 +1880,7 @@ withSimilarSurface surface contentType width height f = -- | Like 'withSimilarSurface' but creates a Surface that is managed by the --- Haskell memory manager rather than only being temporaily allocated. This +-- Haskell memory manager rather than only being temporarily allocated. This -- is more flexible and allows you to create surfaces that persist, which -- can be very useful, for example to cache static elements in an animation. -- @@ -1904,7 +1904,7 @@ createSimilarSurface surface contentType width height = do -- surface (like a combination of 'withTargetSurface' and 'withSimilarSurface'). -- -- This is useful for drawing to a temporary surface and then compositing it --- into the main suface. For example, the following code draws to a temporary +-- into the main surface. For example, the following code draws to a temporary -- surface and then uses that as a mask: -- -- > renderWithSimilarSurface ContentAlpha 200 200 $ \tmpSurface -> do @@ -2026,7 +2026,7 @@ formatStrideForWidth = Internal.formatStrideForWidth #endif -- | Creates an image surface of the specified format and dimensions. --- The initial contents of the surface is undefined; you must explicitely +-- The initial contents of the surface is undefined; you must explicitly -- clear the buffer, using, for example, 'rectangle' and 'fill' if you want it -- cleared. -- @@ -2046,7 +2046,7 @@ withImageSurface format width height f = (\surface -> f surface) -- | Like 'withImageSurface' but creates a Surface that is managed by the --- Haskell memory manager rather than only being temporaily allocated. This +-- Haskell memory manager rather than only being temporarily allocated. This -- is more flexible and allows you to create surfaces that persist, which -- can be very useful, for example to cache static elements in an animation. -- @@ -2150,7 +2150,7 @@ imageSurfaceGetData a = do -- number of bytes between rows. -- -- * The returned array is a flat representation of a three dimensional array: --- x-coordiante, y-coordinate and several channels for each color. The +-- x-coordinate, y-coordinate and several channels for each color. The -- format depends on the 'Format' of the surface: -- -- 'FormatARGB32': each pixel is 32 bits with alpha in the upper 8 bits, @@ -2163,7 +2163,7 @@ imageSurfaceGetData a = do -- 'FormatA8': each pixel is 8 bits holding an alpha value -- -- 'FormatA1': each pixel is one bit where pixels are packed into 32 bit --- quantities. The ordering depends on the endianes of the platform. On a +-- quantities. The ordering depends on the endianness of the platform. On a -- big-endian machine, the first pixel is in the uppermost bit, on a -- little-endian machine the first pixel is in the least-significant bit. -- diff --git a/cairo/Graphics/Rendering/Cairo/Internal/Drawing/Transformations.chs b/cairo/Graphics/Rendering/Cairo/Internal/Drawing/Transformations.chs index a28b39461..9a4628725 100644 --- a/cairo/Graphics/Rendering/Cairo/Internal/Drawing/Transformations.chs +++ b/cairo/Graphics/Rendering/Cairo/Internal/Drawing/Transformations.chs @@ -1,6 +1,6 @@ ----------------------------------------------------------------------------- -- | --- Module : Graphics.Rendering.Cairo.Internal.Drawing.Tranformations +-- Module : Graphics.Rendering.Cairo.Internal.Drawing.Transformations -- Copyright : (c) Paolo Martini 2005 -- License : BSD-style (see cairo/COPYRIGHT) -- diff --git a/docs/tools/AddLinks.hs b/docs/tools/AddLinks.hs index 2754a3214..7fe037c71 100644 --- a/docs/tools/AddLinks.hs +++ b/docs/tools/AddLinks.hs @@ -87,7 +87,7 @@ parseExports content = flip Map.lookup concordance ----------------------------------------------------------------------------- -- Secondly, scanning, munging stuff --- to find the code snippets and to do all necesary conversion/escaping +-- to find the code snippets and to do all necessary conversion/escaping -- and add in the links and call the next bit to do any syntax highliting -- data DocType = LaTeX | XHTML diff --git a/docs/tutorial/Tutorial_Port/app1.xhtml b/docs/tutorial/Tutorial_Port/app1.xhtml index 1d1b04312..518aea2b2 100644 --- a/docs/tutorial/Tutorial_Port/app1.xhtml +++ b/docs/tutorial/Tutorial_Port/app1.xhtml @@ -22,7 +22,7 @@ using the Cairo drawing library. Drawing in Gtk2Hs is not very different from dr though that subject is large enough to merit its own tutorials.

See the Cairo Documentation Site for that.

Drawing to the screen or in portable network graphics (png), portable document format (pdf), -postscript (ps) or scaleable vector graphics (svg) formats of any Cairo drawing uses some special syntax in Gtk2Hs. +postscript (ps) or scalable vector graphics (svg) formats of any Cairo drawing uses some special syntax in Gtk2Hs. The goal of this appendix is to explain what basic functions you need.

1. Drawing

@@ -197,7 +197,7 @@ myDraw w h = do

Note that this is just like the previous example, except for the actual drawing. This introduces setSourceRGBA which sets not just the color but also the transparency, as a measure between 0 and 1. The example also uses a rectangle and a method -fill which fills closed figures with the specified color and transparancy.

+fill which fills closed figures with the specified color and transparency.

Note: Because of a naming conflict with an older Gtk2Hs drawing library you must either hide fill in the Graphics.UI.Gtk import statement or use the full name Graphics.Rendering.Cairo.fill .

@@ -250,7 +250,7 @@ are in points (and type Double ), so you'll have to check how this -> IO a

To save you could use the same 'recipe' as above, or the shorter notation:

withPSSurface "myDraw.ps" psw psh (flip renderWith (myDraw psw psh >> showPage))
-

Finally, to save in scaleable vector graphics format, use the same syntax, but with +

Finally, to save in scalable vector graphics format, use the same syntax, but with withSVGSurface . So this would be:

withSVGSurface "myDraw.svg" pgw pgh (flip renderWith $ myDraw pgw pgh >> showPage)

An example that saves the last drawing shown above in all four formats (with different sizes) is:

diff --git a/docs/tutorial/Tutorial_Port/chap4-6.xhtml b/docs/tutorial/Tutorial_Port/chap4-6.xhtml index 0f41bb4ba..849a5ffc4 100644 --- a/docs/tutorial/Tutorial_Port/chap4-6.xhtml +++ b/docs/tutorial/Tutorial_Port/chap4-6.xhtml @@ -21,7 +21,7 @@

The Entry widget allows text to be typed and displayed in a single line text box. A fairly large set of key bindings are supported by default. The -user can choose between insert and overwite mode by toggling the +user can choose between insert and overwrite mode by toggling the Insert key.

diff --git a/docs/tutorial/Tutorial_Port/chap4-7.xhtml b/docs/tutorial/Tutorial_Port/chap4-7.xhtml index 451b5aa88..8bab15150 100644 --- a/docs/tutorial/Tutorial_Port/chap4-7.xhtml +++ b/docs/tutorial/Tutorial_Port/chap4-7.xhtml @@ -100,7 +100,7 @@ without manually creating an adjustment.

-The three arguments, all of type Double, specify the minum +The three arguments, all of type Double, specify the minimum allowable value, the maximum allowable value, and the increment added or subtracted by spinning the widget.

diff --git a/docs/tutorial/Tutorial_Port/chap5-2.xhtml b/docs/tutorial/Tutorial_Port/chap5-2.xhtml index abd367188..b65647f64 100644 --- a/docs/tutorial/Tutorial_Port/chap5-2.xhtml +++ b/docs/tutorial/Tutorial_Port/chap5-2.xhtml @@ -68,7 +68,7 @@ FileChooserActionOpen here, and when the user definitely chooses a file by doubleclicking it or pressing the Enter key, the - onFileActived signal is emitted. Then we use:

+ onFileActivated signal is emitted. Then we use:

fileChooserGetFilename :: FileChooserClass self => self -> IO (Maybe FilePath)

From the filepath, the program can then open the file, or @@ -304,7 +304,7 @@ Maybe String -- title of the dialog or default folder. As in the example before, trying to create a folder which already exists results in an error message. Overwriting a file, however, makes sense and is allowed by default. You can make the - user confirm any overwite of a file with:

+ user confirm any overwrite of a file with:

fileChooserSetDoOverwriteconfirmation :: FileChooserClass self
 => self -> Bool -> IO ()
diff --git a/docs/tutorial/Tutorial_Port/chap5-4.xhtml b/docs/tutorial/Tutorial_Port/chap5-4.xhtml index 87cee8df2..880147ee8 100644 --- a/docs/tutorial/Tutorial_Port/chap5-4.xhtml +++ b/docs/tutorial/Tutorial_Port/chap5-4.xhtml @@ -91,7 +91,7 @@ notebookEnablePopup :: NotebookClass self => Attr self Bool another page than the (default) first one. The attribute notebookEnablePopup determines whether the user's clicking the right mouse button on a tab will show a popup menu - of all the available pages. That is, if the menu fuctions have + of all the available pages. That is, if the menu functions have been defined.

A Notebook widget has its own signal handling diff --git a/docs/tutorial/Tutorial_Port/es-app1.xhtml b/docs/tutorial/Tutorial_Port/es-app1.xhtml index edd1aa87f..6e454895c 100644 --- a/docs/tutorial/Tutorial_Port/es-app1.xhtml +++ b/docs/tutorial/Tutorial_Port/es-app1.xhtml @@ -23,7 +23,7 @@ en Cairo, pero no está de más desarrollar un tutorial especí

Puedes consultar el centro de documentación de Cairo.

Para dibujar usando los formatos de Cairo con Gtk2Hs necesitamos una sintaxis especial, ya sea pare realizar dibujos en pantalla, o en diferentes formatos de fichero, portable network graphics (png), portable document format (pdf), -postscript (ps) o scaleable vector graphics (svg). +postscript (ps) o scalable vector graphics (svg). El objetivo de este apéndice es explicar las funciones básicas que necesitarás.

1. Dibujar

diff --git a/docs/tutorial/intro/index.t2t b/docs/tutorial/intro/index.t2t index 0f3b4fdba..b3d0158ad 100644 --- a/docs/tutorial/intro/index.t2t +++ b/docs/tutorial/intro/index.t2t @@ -7,7 +7,7 @@ This is an unreviewed first draft of a //Getting Started// tutorial to Gtk2Hs. == Introduction == GTK+ started life as the Gimp Tool Kit, that is, the user interface library for the Gimp drawing program. It has grown to a general-purpose, multi-platform user interface library, with bindings for many programming languages. This tutorial describes Gtk2Hs, a binding for the functional programming language Haskell. Gtk+ and Gtk2Hs offer a large number of widgets, ranging from windows and buttons to menus and tree widgets that feature a separation of the GUI element (the view) from the data store (the model). The toolkit includes a visual interface designer, Glade, which stores the composition of several widgets (user interface elements), their layout and many attributes in an XML file. -An application can use Gtk2Hs to load these so created windows at runtime and connect the individual widgets to the application logic. Of course, anything that can be created using Glade can also be constructed programatically. Building and destroying, accessing and manipulating widgets is all done through the Gtk2Hs library [API https://github.com/gtk2hs/gtk2hs/tree/master/docs]. +An application can use Gtk2Hs to load these so created windows at runtime and connect the individual widgets to the application logic. Of course, anything that can be created using Glade can also be constructed programmatically. Building and destroying, accessing and manipulating widgets is all done through the Gtk2Hs library [API https://github.com/gtk2hs/gtk2hs/tree/master/docs]. Gtk+ itself is written in C, even though the widgets are described in an objects-oriented fashion with attributes and methods, derived from a single root object. This class hierarchy is reflected in Gtk2Hs using the Haskell type classes and data types. Gtk2Hs provides a Haskell equivalent to most functions in Gtk+. Since a graphical user interface is concerned with input and output of an application, most Gtk2Hs functions live in the Haskell IO monad. @@ -154,8 +154,8 @@ main = do | button <- [button1, button2, button3] ] -- This sets button3 to be a so called 'secondary child'. When the layout - -- stlye is ButtonboxStart or ButtonboxEnd, the secondary children are - -- grouped seperately from the others. Resize the window to see the effect. + -- style is ButtonboxStart or ButtonboxEnd, the secondary children are + -- grouped separately from the others. Resize the window to see the effect. -- -- This is not interesting in itself but shows how to set child attributes. -- Note that the child attribute 'buttonBoxChildSecondary' takes the diff --git a/docs/tutorial/tutorial.t2t b/docs/tutorial/tutorial.t2t index 29f027c14..35b27ffb8 100644 --- a/docs/tutorial/tutorial.t2t +++ b/docs/tutorial/tutorial.t2t @@ -87,7 +87,7 @@ constructor ``windowNew :: IO Window`` creates a new top level window. A window has certain property which are defined in the [Window module https://hackage.haskell.org/package/gtk-0.14.6/docs/Graphics-UI-Gtk-Windows-Window.html]. One of these properties is the name that appears in the title bar, -documented as ``windowTitle :: WindowClas s self => Attr self String``. +documented as ``windowTitle :: WindowClass self => Attr self String``. This property is accessible through the ``set`` and ``get`` functions. For instance, the line ``set window [ windowTitle := "Hello World" ]`` sets the ``windowTitle`` property of ``window`` to the given string. diff --git a/gio/System/GIO/Async/Cancellable.chs b/gio/System/GIO/Async/Cancellable.chs index f16a8acf6..b1cfb4f23 100644 --- a/gio/System/GIO/Async/Cancellable.chs +++ b/gio/System/GIO/Async/Cancellable.chs @@ -99,7 +99,7 @@ cancellablePopCurrent cancellable = {# call cancellable_pop_current #} (fromMaybe (Cancellable nullForeignPtr) cancellable) --- | Pushes cancellable onto the cancellable stack. The current cancllable can then be recieved using +-- | Pushes cancellable onto the cancellable stack. The current cancllable can then be received using -- 'cancellableGetCurrent' . -- -- This is useful when implementing cancellable operations in code that does not allow you to pass down diff --git a/gio/System/GIO/File/AppInfo.chs b/gio/System/GIO/File/AppInfo.chs index d49b71e60..1d848ab03 100644 --- a/gio/System/GIO/File/AppInfo.chs +++ b/gio/System/GIO/File/AppInfo.chs @@ -216,7 +216,7 @@ appInfoGetIcon appinfo = -- @launchContext@ to get information about the details of the launcher (like what screen it is on). -- Throws a 'GError' if an error occurs -- --- To lauch the application without arguments pass a emtpy files list. +-- To launch the application without arguments pass a empty files list. -- -- Note that even if the launch is successful the application launched can fail to start if it runs -- into problems during startup. There is no way to detect this. @@ -257,7 +257,7 @@ appInfoSupportsUris appinfo = -- @launchContext@ to get information about the details of the launcher (like what screen it is on). -- Throws a 'GError' if an error occurs. -- --- To lauch the application without arguments pass a empty uris list. +-- To launch the application without arguments pass a empty uris list. -- -- Note that even if the launch is successful the application launched can fail to start if it runs -- into problems during startup. There is no way to detect this. diff --git a/gio/System/GIO/File/ContentType.chs b/gio/System/GIO/File/ContentType.chs index 736bbf39f..64dc24f59 100644 --- a/gio/System/GIO/File/ContentType.chs +++ b/gio/System/GIO/File/ContentType.chs @@ -31,7 +31,7 @@ module System.GIO.File.ContentType ( -- * Details -- -- | A content type is a platform specific string that defines the type of a file. On unix it is a mime --- type, on win32 it is an extension string like ".doc", ".txt" or a percieved string like +-- type, on win32 it is an extension string like ".doc", ".txt" or a perceived string like -- "audio". Such strings can be looked up in the registry at HkeyClassesRoot. -- * Methods diff --git a/gio/System/GIO/File/File.chs b/gio/System/GIO/File/File.chs index 78f9c5f18..f688f30a2 100644 --- a/gio/System/GIO/File/File.chs +++ b/gio/System/GIO/File/File.chs @@ -408,7 +408,7 @@ fileGetChildForDisplayName file displayName = withUTFString displayName $ \cDisplayName -> propagateGError ({# call file_get_child_for_display_name #} (toFile file) cDisplayName) --- | Checks whether file has the prefix specified by prefix. In other word, if the names of inital +-- | Checks whether file has the prefix specified by prefix. In other word, if the names of initial -- elements of files pathname match prefix. Only full pathname elements are matched, so a path like -- /foo is not considered a prefix of /foobar, only of / foo/bar. -- @@ -1882,7 +1882,7 @@ fileStopMountable file flags mountOperation cancellable callback = do -- | Finishes a stop operation. See 'fileStopMountable' for details. -- --- Finish an asynchronous stop operation that was stoped with 'fileStopMountable'. +-- Finish an asynchronous stop operation that was stopped with 'fileStopMountable'. -- -- Throws a 'GError' if an error occurs. fileStopMountableFinish :: FileClass file diff --git a/gio/System/GIO/File/FileAttribute.hsc b/gio/System/GIO/File/FileAttribute.hsc index 335e75b95..58e402c8f 100644 --- a/gio/System/GIO/File/FileAttribute.hsc +++ b/gio/System/GIO/File/FileAttribute.hsc @@ -39,14 +39,14 @@ module System.GIO.File.FileAttribute ( -- -- Keys are strings that contain a key namespace and a key name, separated by a colon, -- e.g. "namespace:keyname". Namespaces are included to sort key-value pairs by namespaces for --- relevance. Keys can be retrived using wildcards, e.g. \"standard::*\" will return all of the keys in +-- relevance. Keys can be retrieved using wildcards, e.g. \"standard::*\" will return all of the keys in -- the "standard" namespace. -- -- Values are stored within the list in 'FileAttributeValue' structures. Values can store different -- types, listed in the enum 'FileAttributeType'. Upon creation of a 'FileAttributeValue', the type will -- be set to 'FileAttributeTypeInvalid'. -- --- The list of possible attributes for a filesystem (pointed to by a 'File') is availible as a +-- The list of possible attributes for a filesystem (pointed to by a 'File') is available as a -- 'FileAttributeInfoList'. This list is queryable by key names as indicated earlier. -- -- Classes that implement 'FileIface' will create a 'FileAttributeInfoList' and install default keys and diff --git a/gio/System/GIO/File/FileInfo.chs b/gio/System/GIO/File/FileInfo.chs index 854f11942..d3293117e 100644 --- a/gio/System/GIO/File/FileInfo.chs +++ b/gio/System/GIO/File/FileInfo.chs @@ -213,7 +213,7 @@ fileInfoRemoveAttribute info attribute = withUTFString attribute $ \ attributePtr -> {#call g_file_info_remove_attribute#} (toFileInfo info) attributePtr --- | Gets the value of a attribute, formated as a string. This escapes things as needed to make the +-- | Gets the value of a attribute, formatted as a string. This escapes things as needed to make the -- string valid utf8. fileInfoGetAttributeAsString :: (FileInfoClass info, GlibString string) => info -> string -- ^ @attribute@ a file attribute key. diff --git a/gio/System/GIO/Volumes/Drive.chs b/gio/System/GIO/Volumes/Drive.chs index 3d80d9034..5e0b2465b 100644 --- a/gio/System/GIO/Volumes/Drive.chs +++ b/gio/System/GIO/Volumes/Drive.chs @@ -35,11 +35,11 @@ module System.GIO.Volumes.Drive ( -- -- 'Drive' is a container class for 'Volume' objects that stem from the same piece of media. As such, -- 'Drive' abstracts a drive with (or without) removable media and provides operations for querying --- whether media is available, determing whether media change is automatically detected and ejecting +-- whether media is available, determining whether media change is automatically detected and ejecting -- the media. -- -- If the 'Drive' reports that media isn't automatically detected, one can poll for media; typically one --- should not do this periodically as a poll for media operation is potententially expensive and may +-- should not do this periodically as a poll for media operation is potentially expensive and may -- spin up the drive creating noise. -- -- 'Drive' supports starting and stopping drives with authentication support for the former. This can be @@ -175,9 +175,9 @@ driveCanStartDegraded drive = liftM toBool $ {#call g_drive_can_start_degraded#} (toDrive drive) --- | Checks if a drive can be stoped. +-- | Checks if a drive can be stopped. driveCanStop :: DriveClass drive => drive - -> IO Bool -- ^ returns 'True' if the drive can be stoped, 'False' otherwise. + -> IO Bool -- ^ returns 'True' if the drive can be stopped, 'False' otherwise. driveCanStop drive = liftM toBool $ {#call g_drive_can_stop#} (toDrive drive) @@ -228,9 +228,9 @@ driveHasMedia drive = liftM toBool $ {#call g_drive_has_media#} (toDrive drive) --- | Checks if drive is capabable of automatically detecting media changes. +-- | Checks if drive is capable of automatically detecting media changes. driveIsMediaCheckAutomatic :: DriveClass drive => drive - -> IO Bool -- ^ returns 'True' if the drive is capabable of automatically detecting media changes, 'False' otherwise. + -> IO Bool -- ^ returns 'True' if the drive is capable of automatically detecting media changes, 'False' otherwise. driveIsMediaCheckAutomatic drive = liftM toBool $ {#call g_drive_is_media_check_automatic#} (toDrive drive) @@ -335,7 +335,7 @@ driveStop drive flags mountOperation cancellable callback = do cCallback (castFunPtrToPtr cCallback) --- | Finishes stoping a drive. +-- | Finishes stopping a drive. -- -- Throws a 'GError' if an error occurs. driveStopFinish :: DriveClass drive @@ -351,7 +351,7 @@ driveStopFinish drive result = return ()) #endif --- | Gets the kinds of identifiers that drive has. Use 'driveGetIdentifer' to obtain the +-- | Gets the kinds of identifiers that drive has. Use 'driveGetIdentifier' to obtain the -- identifiers themselves. driveEnumerateIdentifiers :: (DriveClass drive, GlibString string) => drive -> IO [string] diff --git a/gio/System/GIO/Volumes/Mount.chs b/gio/System/GIO/Volumes/Mount.chs index 0c7eb7869..0c6825dc8 100644 --- a/gio/System/GIO/Volumes/Mount.chs +++ b/gio/System/GIO/Volumes/Mount.chs @@ -317,7 +317,7 @@ mountGuessContentType mount forceRescan cancellable callback = do cCallback (castFunPtrToPtr cCallback) --- | Finishes guessing content types of mount. If any errors occured during the operation, error will be +-- | Finishes guessing content types of mount. If any errors occurred during the operation, error will be -- set to contain the errors and 'False' will be returned. In particular, you may get an -- 'IoErrorNotSupported' if the mount does not support content guessing. mountGuessContentTypeFinish :: (MountClass mount, GlibString string) => mount diff --git a/gio/System/GIO/Volumes/Volume.chs b/gio/System/GIO/Volumes/Volume.chs index d232601d7..cb66ef80e 100644 --- a/gio/System/GIO/Volumes/Volume.chs +++ b/gio/System/GIO/Volumes/Volume.chs @@ -189,7 +189,7 @@ volumeMount volume flags mountOperation cancellable callback = do cCallback (castFunPtrToPtr cCallback) --- | Finishes mounting a volume. If any errors occured during the operation, error will be set to contain +-- | Finishes mounting a volume. If any errors occurred during the operation, error will be set to contain -- the errors and 'False' will be returned. -- -- If the mount operation succeeded, 'volumeGetMount' on volume is guaranteed to return the mount @@ -251,7 +251,7 @@ volumeEjectWithOperationFinish volume result = return ()) #endif --- | Gets the kinds of identifiers that volume has. Use 'volumeGetIdentifer' to obtain the +-- | Gets the kinds of identifiers that volume has. Use 'volumeGetIdentifier' to obtain the -- identifiers themselves. volumeEnumerateIdentifiers :: (VolumeClass volume, GlibString string) => volume -> IO [string] diff --git a/gio/hierarchy.list b/gio/hierarchy.list index 8140c7e9f..b3ff1aac1 100644 --- a/gio/hierarchy.list +++ b/gio/hierarchy.list @@ -10,7 +10,7 @@ # function is not specified, the is converted to # gtk__get_type where is where each upperscore # letter is converted to an underscore and lowerletter. The underscore -# is omitted if an upperscore letter preceeded: GtkHButtonBox -> +# is omitted if an upperscore letter preceded: GtkHButtonBox -> # gtk_hbutton_box_get_type. The generation of a type can be # conditional by appending 'if '. Such types are only produces if # --tag= is given on the command line of TypeGenerator. @@ -211,7 +211,7 @@ GtkSourceLanguageManager if gtksourceview2 GladeXML as GladeXML, glade_xml_get_type if libglade GConfClient as GConf if gconf -# These ones are actualy interfaces, but interface implementations are GObjects +# These ones are actually interfaces, but interface implementations are GObjects GtkEditable GtkSourceStyle as SourceStyleObject if gtksourceview2 GtkSourceStyleScheme if sourceview diff --git a/glib/System/Glib/GError.chs b/glib/System/Glib/GError.chs index 1502715dd..3440ffad7 100644 --- a/glib/System/Glib/GError.chs +++ b/glib/System/Glib/GError.chs @@ -192,7 +192,7 @@ throwGError = throw -- | This will catch any GError exception. The handler function will receive the -- raw GError. This is probably only useful when you want to take some action --- that does not depend on which GError exception has occured, otherwise it +-- that does not depend on which GError exception has occurred, otherwise it -- would be better to use either 'catchGErrorJust' or 'catchGErrorJustDomain'. -- For example: -- @@ -214,7 +214,7 @@ catchGError = catch -- > do image <- catchGErrorJust PixbufErrorCorruptImage -- > loadImage -- > (\errorMessage -> do log errorMessage --- > return mssingImagePlaceholder) +-- > return missingImagePlaceholder) -- catchGErrorJust :: GErrorClass err => err -- ^ The error to catch -> IO a -- ^ The computation to run @@ -248,7 +248,7 @@ catchGErrorJustDomain action (handler :: err -> GErrorMessage -> IO a) = | fromIntegral domain == gerrorDomain (undefined::err) = handler (toEnum code) msg | otherwise = throwGError gerror --- | A verson of 'catchGError' with the arguments swapped around. +-- | A version of 'catchGError' with the arguments swapped around. -- -- > handleGError (\(GError dom code msg) -> ...) $ -- > ... @@ -257,11 +257,11 @@ handleGError :: (GError -> IO a) -> IO a -> IO a handleGError = handle {-# DEPRECATED handleGError "Use ordinary Control.Exception.handle" #-} --- | A verson of 'handleGErrorJust' with the arguments swapped around. +-- | A version of 'handleGErrorJust' with the arguments swapped around. handleGErrorJust :: GErrorClass err => err -> (GErrorMessage -> IO a) -> IO a -> IO a handleGErrorJust code = flip (catchGErrorJust code) --- | A verson of 'catchGErrorJustDomain' with the arguments swapped around. +-- | A version of 'catchGErrorJustDomain' with the arguments swapped around. handleGErrorJustDomain :: GErrorClass err => (err -> GErrorMessage -> IO a) -> IO a -> IO a handleGErrorJustDomain = flip catchGErrorJustDomain diff --git a/glib/System/Glib/GObject.chs b/glib/System/Glib/GObject.chs index b7274f1f9..b7b3dada4 100644 --- a/glib/System/Glib/GObject.chs +++ b/glib/System/Glib/GObject.chs @@ -111,7 +111,7 @@ gTypeGObject = object -- It should be used whenever a function returns a pointer to an existing -- 'GObject' (as opposed to a function that constructs a new object). -- --- * The first argument is the contructor of the specific object. +-- * The first argument is the constructor of the specific object. -- makeNewGObject :: GObjectClass obj @@ -139,7 +139,7 @@ constructNewGObject :: GObjectClass obj => constructNewGObject (constr, objectUnref) generator = do objPtr <- generator #if GLIB_CHECK_VERSION(2,10,0) - -- change the exisiting floating reference into a proper reference; + -- change the existing floating reference into a proper reference; -- the name is confusing, what the function does is ref,sink,unref objectRefSink objPtr #endif @@ -207,7 +207,7 @@ objectSetAttribute attr obj (Just val) = do -- -- * Note that this function may crash the Haskell run-time since the -- returned type can be forced to be anything. See 'objectCreateAttribute' --- for a safe wrapper around this funciton. +-- for a safe wrapper around this function. -- objectGetAttributeUnsafe :: GObjectClass o => Quark -> o -> IO (Maybe a) objectGetAttributeUnsafe attr obj = do diff --git a/glib/System/Glib/Signals.chs b/glib/System/Glib/Signals.chs index 27bdc336d..b7a494950 100644 --- a/glib/System/Glib/Signals.chs +++ b/glib/System/Glib/Signals.chs @@ -27,7 +27,7 @@ -- the marshall list mentions OBJECT it refers to an instance of this -- GObject which is automatically wrapped with a ref and unref call. -- Structures which are not derived from GObject have to be passed as --- BOXED which gives the signal connect function a possiblity to do the +-- BOXED which gives the signal connect function a possibility to do the -- conversion into a proper ForeignPtr type. In special cases the signal -- connect function use a PTR type which will then be mangled in the -- user function directly. The latter is needed if a signal delivers a @@ -113,7 +113,7 @@ type SignalName = String -- data GObjectClass o => ConnectId o = ConnectId {#type gulong#} o --- old name for backwards compatability +-- old name for backwards compatibility disconnect :: GObjectClass obj => ConnectId obj -> IO () disconnect = signalDisconnect {-# DEPRECATED disconnect "use signalDisconnect instead" #-} @@ -130,7 +130,7 @@ signalDisconnect (ConnectId handler obj) = -- -- * Blocks a handler of an instance so it will not be called during any -- signal emissions unless it is unblocked again. Thus \"blocking\" a signal --- handler means to temporarily deactive it, a signal handler has to be +-- handler means to temporarily deactivate it, a signal handler has to be -- unblocked exactly the same amount of times it has been blocked before -- to become active again. -- diff --git a/glib/System/Glib/hsgclosure.c b/glib/System/Glib/hsgclosure.c index 91fb765e1..1610702b2 100644 --- a/glib/System/Glib/hsgclosure.c +++ b/glib/System/Glib/hsgclosure.c @@ -117,7 +117,7 @@ gtk2hs_closure_marshal(GClosure *closure, /* barf if anything went wrong */ /* TODO: pass a sensible value for call site so we get better error messages */ - /* or perhaps we can propogate any error? */ + /* or perhaps we can propagate any error? */ rts_checkSchedStatus("gtk2hs_closure_marshal", cap); WHEN_DEBUG(g_debug("gtk2hs_closure_marshal(%p): ret=%p", hc->callback, ret)); diff --git a/gtk/Graphics/UI/Gtk/Abstract/Box.chs b/gtk/Graphics/UI/Gtk/Abstract/Box.chs index 0df75679c..dae07d113 100644 --- a/gtk/Graphics/UI/Gtk/Abstract/Box.chs +++ b/gtk/Graphics/UI/Gtk/Abstract/Box.chs @@ -54,7 +54,7 @@ module Graphics.UI.Gtk.Abstract.Box ( -- parameter that denotes how to fill up unused space. -- -- While the right amount of padding around each widget is a matter of --- appearance, the 'Packing' paramter specifies the way the widgets in +-- appearance, the 'Packing' parameter specifies the way the widgets in -- the container behave when the window is resized and thereby affect -- the usability. Hence, once you have created a window, you should resize -- it and see if the widgets behave as expected. The 'Packing' parameter of @@ -195,7 +195,7 @@ boxPackStart self child packing padding = -- -- Note that -- for 'boxPackEnd' the 'PackNatural' option will move a child to the right in --- an 'HBox' or to the bottom in an 'VBox' if there is more space availble. +-- an 'HBox' or to the bottom in an 'VBox' if there is more space available. -- boxPackEnd :: (BoxClass self, WidgetClass child) => self -> child -- ^ @child@ - the 'Widget' to be added to the box. @@ -343,7 +343,7 @@ boxSetChildPacking self child packing padding packType = where (expand, fill) = fromPacking packing #if GTK_CHECK_VERSION(3,10,0) --- | Gets the value set by `boxSetBaselinePostion` +-- | Gets the value set by `boxSetBaselinePosition` boxGetBaselinePosition :: BoxClass self => self -> IO BaselinePosition boxGetBaselinePosition self = diff --git a/gtk/Graphics/UI/Gtk/Abstract/ButtonBox.chs b/gtk/Graphics/UI/Gtk/Abstract/ButtonBox.chs index 870486109..a23ec49a3 100644 --- a/gtk/Graphics/UI/Gtk/Abstract/ButtonBox.chs +++ b/gtk/Graphics/UI/Gtk/Abstract/ButtonBox.chs @@ -142,7 +142,7 @@ buttonBoxSetChildNonHomogeneous self child nonHomogeneous = (toWidget child) (fromBool nonHomogeneous) --- | Returns whether the child is exempted from homogenous sizing. +-- | Returns whether the child is exempted from homogeneous sizing. -- buttonBoxGetChildNonHomogeneous :: (ButtonBoxClass self, WidgetClass child) => self -> child -- ^ @child@ - a child of the button box widget diff --git a/gtk/Graphics/UI/Gtk/Abstract/Container.chs b/gtk/Graphics/UI/Gtk/Abstract/Container.chs index b264d0356..7908d24fc 100644 --- a/gtk/Graphics/UI/Gtk/Abstract/Container.chs +++ b/gtk/Graphics/UI/Gtk/Abstract/Container.chs @@ -112,7 +112,7 @@ module Graphics.UI.Gtk.Abstract.Container ( -- -- > set container [ attr child := value ] -- --- And similarily for getting a child attribute's value: +-- And similarly for getting a child attribute's value: -- -- > value <- get container (attr child) -- diff --git a/gtk/Graphics/UI/Gtk/Abstract/Object.chs b/gtk/Graphics/UI/Gtk/Abstract/Object.chs index 7fb92b9b4..c1f282087 100644 --- a/gtk/Graphics/UI/Gtk/Abstract/Object.chs +++ b/gtk/Graphics/UI/Gtk/Abstract/Object.chs @@ -103,7 +103,7 @@ foreign import ccall unsafe "gtk_object_sink" -- This is a convenience function to generate a new widget. It adds the -- finalizer with the method described under objectSink. -- --- * The constr argument is the contructor of the specific object. +-- * The constr argument is the constructor of the specific object. -- #if GTK_MAJOR_VERSION < 3 makeNewObject :: ObjectClass obj => diff --git a/gtk/Graphics/UI/Gtk/Abstract/Paned.chs b/gtk/Graphics/UI/Gtk/Abstract/Paned.chs index a1525c396..86f9af6e2 100644 --- a/gtk/Graphics/UI/Gtk/Abstract/Paned.chs +++ b/gtk/Graphics/UI/Gtk/Abstract/Paned.chs @@ -31,7 +31,7 @@ module Graphics.UI.Gtk.Abstract.Paned ( -- | 'Paned' is the base class for widgets with two panes, arranged either -- horizontally ('HPaned') or vertically ('VPaned'). Child widgets are added to -- the panes of the widget with 'panedPack1' and 'panedPack2'. The division --- beween the two children is set by default from the size requests of the +-- between the two children is set by default from the size requests of the -- children, but it can be adjusted by the user. -- -- A paned widget draws a separator between the two child widgets and a diff --git a/gtk/Graphics/UI/Gtk/Abstract/Range.chs b/gtk/Graphics/UI/Gtk/Abstract/Range.chs index 5c4465e3a..98b9f5538 100644 --- a/gtk/Graphics/UI/Gtk/Abstract/Range.chs +++ b/gtk/Graphics/UI/Gtk/Abstract/Range.chs @@ -267,7 +267,7 @@ rangeSetRange self min max = -- -- * 'SensitivityAuto': the arrow is made insensitive if the thumb is at the end -- --- * 'SensitivityOn': the arrow is alwasy sensitive +-- * 'SensitivityOn': the arrow is always sensitive -- -- * 'SensitivityOff': the arrow is always insensitive -- @@ -340,7 +340,7 @@ rangeGetMinSliderSize range = {#call gtk_range_get_min_slider_size #} (toRange range) --- | This function returns the area that contains the range's trough and its steppers, in 'DrawWindow' +-- | This function returns the area that contains the range's through and its steppers, in 'DrawWindow' -- coordinates. -- -- This function is useful mainly for 'Range' subclasses. @@ -468,7 +468,7 @@ rangeValue = newAttr rangeSetValue #if GTK_CHECK_VERSION(2,20,0) --- | Wheter range's slikder has a fixed size, or a size that depends on it's adjustment's page size. +-- | Whether range's slikder has a fixed size, or a size that depends on it's adjustment's page size. rangeSliderSizeFixed :: RangeClass self => Attr self Bool rangeSliderSizeFixed = newAttr rangeGetSliderSizeFixed diff --git a/gtk/Graphics/UI/Gtk/Abstract/Widget.chs b/gtk/Graphics/UI/Gtk/Abstract/Widget.chs index 6713241f2..fe85dc081 100644 --- a/gtk/Graphics/UI/Gtk/Abstract/Widget.chs +++ b/gtk/Graphics/UI/Gtk/Abstract/Widget.chs @@ -43,7 +43,7 @@ module Graphics.UI.Gtk.Abstract.Widget ( -- the look of applications without the need to write a theme engine in C. -- -- Widgets receive events, that is, signals that indicate some low-level --- user iteraction. The signal handlers for all these events have to +-- user interaction. The signal handlers for all these events have to -- return @True@ if the signal has been dealt with and @False@ if other -- signal handlers should be run. @@ -685,7 +685,7 @@ widgetHideAll self = -- unrealized. When a widget is destroyed, it will break any references it -- holds to other objects.If the widget is inside a container, the widget will -- be removed from the container. The widget will be garbage collected --- (finalized) time after your last reference to the widget dissapears. +-- (finalized) time after your last reference to the widget disappears. -- -- In most cases, only toplevel widgets (windows) require explicit -- destruction, because when you destroy a toplevel its children will be @@ -823,7 +823,7 @@ widgetSizeRequest self = alloca $ \reqPtr -> do peek reqPtr -- | This function is only for use in widget implementations. Obtains the --- chached requisition information in the widget, unless someone has forced a +-- cached requisition information in the widget, unless someone has forced a -- particular geometry on the widget (e.g. with 'widgetSetSizeRequest'), in which -- case it returns that geometry instead of the widget's requisition. -- @@ -1096,7 +1096,7 @@ widgetSetSensitive self sensitive = (toWidget self) (fromBool sensitive) --- bad spelling backwards compatability definition +-- bad spelling backwards compatibility definition widgetSetSensitivity :: WidgetClass self => self -> Bool -> IO () widgetSetSensitivity = widgetSetSensitive @@ -1396,7 +1396,7 @@ widgetGetDefaultColormap = -- set the direction is present in order so that correct localization into -- languages with right-to-left reading directions can be done. Generally, -- applications will let the default reading direction present, except for --- containers where the containers are arranged in an order that is explicitely +-- containers where the containers are arranged in an order that is explicitly -- visual rather than logical (such as buttons for text justification). -- -- If the direction is set to 'TextDirNone', then the value set by @@ -1516,7 +1516,7 @@ widgetInputShapeCombineRegion self region = -- Works even if the widget is obscured. The depth and visual of the resulting pixmap is dependent on -- the widget being snapshot and likely differs from those of a target widget displaying the -- pixmap. The function 'pixbufGetFromDrawable' can be used to convert the pixmap to a visual --- independant representation. +-- independent representation. -- -- The snapshot area used by this function is the widget's allocation plus any extra space occupied by -- additional windows belonging to this widget (such as the arrows of a spin button). Thus, the @@ -1709,7 +1709,7 @@ widgetOverrideCursor self cursor secondaryCursor = -- | Modifies style values on the widget. Modifications made using this -- technique take precedence over style values set via an RC file, however, --- they will be overriden if a style is explicitely set on the widget using +-- they will be overridden if a style is explicitly set on the widget using -- 'widgetSetStyle'. The 'RcStyle' structure is designed so each field can -- either be set or unset, so it is possible, using this function, to modify -- some style values and leave the others unchanged. @@ -2336,7 +2336,7 @@ widgetGetDisplay self = -- %hash c:8e4e d:252b -- | Get the root window where this widget is located. This function can only --- be called after the widget has been added to a widget heirarchy with +-- be called after the widget has been added to a widget hierarchy with -- 'Window' at the top. -- -- The root window is useful for such purposes as creating a popup @@ -2375,12 +2375,12 @@ widgetGetScreen self = -- %hash c:4fab d:aae2 -- | Checks whether there is a 'Screen' is associated with this widget. All -- toplevel widgets have an associated screen, and all widgets added into a --- heirarchy with a toplevel window at the top. +-- hierarchy with a toplevel window at the top. -- -- * Available since Gtk+ version 2.2 -- widgetHasScreen :: WidgetClass self => self - -> IO Bool -- ^ returns @True@ if there is a 'Screen' associcated with the + -> IO Bool -- ^ returns @True@ if there is a 'Screen' associated with the -- widget. widgetHasScreen self = liftM toBool $ @@ -2392,7 +2392,7 @@ widgetHasScreen self = -- | Gets the size request that was explicitly set for the widget using -- 'widgetSetSizeRequest'. A value of -1 for @width@ or @height@ -- indicates that that dimension has not been set explicitly and the natural --- requisition of the widget will be used intead. See 'widgetSetSizeRequest'. +-- requisition of the widget will be used instead. See 'widgetSetSizeRequest'. -- To get the size a widget will actually use, call 'widgetSizeRequest' instead -- of this function. -- diff --git a/gtk/Graphics/UI/Gtk/ActionMenuToolbar/ActionGroup.chs b/gtk/Graphics/UI/Gtk/ActionMenuToolbar/ActionGroup.chs index b0b0e1714..bd11dbc45 100644 --- a/gtk/Graphics/UI/Gtk/ActionMenuToolbar/ActionGroup.chs +++ b/gtk/Graphics/UI/Gtk/ActionMenuToolbar/ActionGroup.chs @@ -249,9 +249,9 @@ actionGroupRemoveAction self action = self (toAction action) --- Note: for these next few funtions we cannot use the C version because the --- callback doesn't allow for propper memory management. So like pygtk we --- implement them natively since they are only convenience functions afterall. +-- Note: for these next few functions we cannot use the C version because the +-- callback doesn't allow for proper memory management. So like pygtk we +-- implement them natively since they are only convenience functions after all. -- | A description of an action. diff --git a/gtk/Graphics/UI/Gtk/ActionMenuToolbar/RadioAction.chs b/gtk/Graphics/UI/Gtk/ActionMenuToolbar/RadioAction.chs index 5a72f5fc1..138ba4e6a 100644 --- a/gtk/Graphics/UI/Gtk/ActionMenuToolbar/RadioAction.chs +++ b/gtk/Graphics/UI/Gtk/ActionMenuToolbar/RadioAction.chs @@ -19,7 +19,7 @@ -- Lesser General Public License for more details. -- -- TODO --- I don't know what the elemnt type of the group GSList is for +-- I don't know what the element type of the group GSList is for -- radioActionSetGroup / radioActionGetGroup -- -- Also, the signals clash with those from other modules diff --git a/gtk/Graphics/UI/Gtk/ActionMenuToolbar/UIManager.chs b/gtk/Graphics/UI/Gtk/ActionMenuToolbar/UIManager.chs index 1c4c7376f..2cf95b754 100644 --- a/gtk/Graphics/UI/Gtk/ActionMenuToolbar/UIManager.chs +++ b/gtk/Graphics/UI/Gtk/ActionMenuToolbar/UIManager.chs @@ -149,7 +149,7 @@ module Graphics.UI.Gtk.ActionMenuToolbar.UIManager ( -- of menuitems and toolitems over another one, and demerge them later. -- -- Merging is done based on the names of the XML elements. Each element is --- identified by a path which consists of the names of its anchestors, +-- identified by a path which consists of the names of its ancestors, -- separated by slashes. For example, the menuitem named \"Left\" in the -- example above has the path @\/ui\/menubar\/JustifyMenu\/Left@ and the -- toolitem with the same name has path diff --git a/gtk/Graphics/UI/Gtk/Buttons/Button.chs b/gtk/Graphics/UI/Gtk/Buttons/Button.chs index 246452bc7..6f476ec36 100644 --- a/gtk/Graphics/UI/Gtk/Buttons/Button.chs +++ b/gtk/Graphics/UI/Gtk/Buttons/Button.chs @@ -413,7 +413,7 @@ buttonGetAlignment self = #endif #if GTK_CHECK_VERSION(2,6,0) --- | Gets the widget that is currenty set as the image of the button. This may +-- | Gets the widget that is currently set as the image of the button. This may -- have been explicitly set by 'buttonSetImage' or constructed by -- 'buttonNewFromStock'. -- diff --git a/gtk/Graphics/UI/Gtk/Buttons/RadioButton.chs b/gtk/Graphics/UI/Gtk/Buttons/RadioButton.chs index e3b0fc331..a3f603282 100644 --- a/gtk/Graphics/UI/Gtk/Buttons/RadioButton.chs +++ b/gtk/Graphics/UI/Gtk/Buttons/RadioButton.chs @@ -114,7 +114,7 @@ module Graphics.UI.Gtk.Buttons.RadioButton ( radioButtonNewWithLabelFromWidget, radioButtonNewWithMnemonicFromWidget, - -- * Compatibilty aliases + -- * Compatibility aliases radioButtonNewJoinGroup, radioButtonNewJoinGroupWithLabel, radioButtonNewJoinGroupWithMnemonic, @@ -318,7 +318,7 @@ radioButtonGroup = newAttr -- | Emitted when the group of radio buttons that a radio button belongs to -- changes. This is emitted when a radio button switches from being alone to -- being part of a group of 2 or more buttons, or vice-versa, and when a --- buttton is moved from one group of 2 or more buttons to a different one, but +-- button is moved from one group of 2 or more buttons to a different one, but -- not when the composition of the group that a button belongs to changes. -- -- * Available since Gtk+ version 2.4 @@ -336,7 +336,7 @@ groupChanged = Signal (connect_NONE__NONE "group-changed") -- | Emitted when the group of radio buttons that a radio button belongs to -- changes. This is emitted when a radio button switches from being alone to -- being part of a group of 2 or more buttons, or vice-versa, and when a --- buttton is moved from one group of 2 or more buttons to a different one, but +-- button is moved from one group of 2 or more buttons to a different one, but -- not when the composition of the group that a button belongs to changes. -- onGroupChanged, afterGroupChanged :: RadioButtonClass self => self diff --git a/gtk/Graphics/UI/Gtk/Display/Label.chs b/gtk/Graphics/UI/Gtk/Display/Label.chs index fff4230a1..96af24a21 100644 --- a/gtk/Graphics/UI/Gtk/Display/Label.chs +++ b/gtk/Graphics/UI/Gtk/Display/Label.chs @@ -310,7 +310,7 @@ labelSetAttributes self attrs = do -- If you want to get the effective attributes for the label, use 'layoutGetAttributes' ('labelGetLayout' (label)). -- labelGetAttributes :: LabelClass self => self - -> IO [PangoAttribute] -- ^ return the attribute list, or Emtpy if none was set. + -> IO [PangoAttribute] -- ^ return the attribute list, or Empty if none was set. labelGetAttributes self = do (txt :: Text) <- labelGetText self (PangoString correct _ _ ) <- makeNewPangoString txt @@ -982,7 +982,7 @@ labelCopyClipboard = Signal (connect_NONE__NONE "copy-clipboard") -- control the cursor programmatically. -- -- The default bindings for this signal come in two variants, the variant with the Shift modifier --- extends the selection, the variant without the Shift modifer does not. There are too many key +-- extends the selection, the variant without the Shift modifier does not. There are too many key -- combinations to list them all here. -- -- * Arrow keys move by individual characters\/lines diff --git a/gtk/Graphics/UI/Gtk/Display/LevelBar.chs b/gtk/Graphics/UI/Gtk/Display/LevelBar.chs index 34da19fe8..3cec207da 100644 --- a/gtk/Graphics/UI/Gtk/Display/LevelBar.chs +++ b/gtk/Graphics/UI/Gtk/Display/LevelBar.chs @@ -183,7 +183,7 @@ levelBarMaxValue = newAttrFromDoubleProperty "max-value" -- | The "bar-mode" property determines the way LevelBar interprets the -- value properties to draw the level fill area. Specifically, when the value is --- LevelBarModeContinous, LevelBar will draw a single block +-- LevelBarModeContinuous, LevelBar will draw a single block -- representing the current value in that area; when the value is -- LevelBarModeDiscrete, the widget will draw a succession of separate -- blocks filling the draw area, with the number of blocks being equal to the diff --git a/gtk/Graphics/UI/Gtk/Display/ProgressBar.chs b/gtk/Graphics/UI/Gtk/Display/ProgressBar.chs index f3f4d4a28..a1c1541dd 100644 --- a/gtk/Graphics/UI/Gtk/Display/ProgressBar.chs +++ b/gtk/Graphics/UI/Gtk/Display/ProgressBar.chs @@ -43,7 +43,7 @@ module Graphics.UI.Gtk.Display.ProgressBar ( -- When an application has no accurate way of knowing the amount of work to -- do, it can use the 'ProgressBar' in activity mode, which shows activity by a -- block moving back and forth within the progress area. In this mode, the --- application is required to call 'progressBarPulse' perodically to update the +-- application is required to call 'progressBarPulse' periodically to update the -- progress bar. -- -- There is quite a bit of flexibility provided to control the appearance of diff --git a/gtk/Graphics/UI/Gtk/Embedding/Plug.chs b/gtk/Graphics/UI/Gtk/Embedding/Plug.chs index 5b419cb9e..c5559897b 100644 --- a/gtk/Graphics/UI/Gtk/Embedding/Plug.chs +++ b/gtk/Graphics/UI/Gtk/Embedding/Plug.chs @@ -105,7 +105,7 @@ import Graphics.UI.Gtk.General.Structs -- plugged into a 'Socket' by 'Graphics.UI.Gtk.Embedding.Socket.socketAddId'. -- -- If a NativeWindowId is supplied the foreign application window will --- immediatly appear in this 'Plug' once it is shown. If @Nothing@ is passed +-- immediately appear in this 'Plug' once it is shown. If @Nothing@ is passed -- then a 'NativeWindowId' can be extracted from this 'Plug' using 'plugGetId' -- and be passed to the application which is to be embedded. -- diff --git a/gtk/Graphics/UI/Gtk/Entry/Editable.chs b/gtk/Graphics/UI/Gtk/Entry/Editable.chs index 1f15d0c32..9ae63a44a 100644 --- a/gtk/Graphics/UI/Gtk/Entry/Editable.chs +++ b/gtk/Graphics/UI/Gtk/Entry/Editable.chs @@ -287,10 +287,10 @@ editableEditable = newAttr -- | The 'editableChanged' signal is emitted at the end of a single -- user-visible operation on the contents of the 'Editable'. -- --- * For inctance, a paste operation that replaces the contents of the +-- * For instance, a paste operation that replaces the contents of the -- selection will cause only one signal emission (even though it is -- implemented by first deleting the selection, then inserting the new --- content, and may cause multiple 'inserText' signals to be +-- content, and may cause multiple 'insertText' signals to be -- emitted). -- editableChanged :: EditableClass ec => Signal ec (IO ()) diff --git a/gtk/Graphics/UI/Gtk/Entry/Entry.chs b/gtk/Graphics/UI/Gtk/Entry/Entry.chs index 34c4cc6b3..f3978ed65 100644 --- a/gtk/Graphics/UI/Gtk/Entry/Entry.chs +++ b/gtk/Graphics/UI/Gtk/Entry/Entry.chs @@ -799,7 +799,7 @@ entryInsertAtCursor = Signal (connect_GLIBSTRING__NONE "insert-at-cursor") -- control the cursor programmatically. -- -- The default bindings for this signal come in two variants, the variant with the Shift modifier --- extends the selection, the variant without the Shift modifer does not. There are too many key +-- extends the selection, the variant without the Shift modifier does not. There are too many key -- combinations to list them all here. -- -- * Arrow keys move by individual characters\/lines diff --git a/gtk/Graphics/UI/Gtk/Gdk/Cursor.chs b/gtk/Graphics/UI/Gtk/Gdk/Cursor.chs index ab19b3f53..c0549ca49 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/Cursor.chs +++ b/gtk/Graphics/UI/Gtk/Gdk/Cursor.chs @@ -122,7 +122,7 @@ cursorNewFromPixmap source mask fg bg x y = -- The functions 'displaySupportsCursorAlpha' and 'displaySupportsCursorColor' can be used to determine whether RGBA cursors are supported; -- 'displayGetDefaultCursorSize' and 'displayGetMaximalCursorSize' give information about cursor sizes. -- --- On the X backend, support for RGBA cursors requires a sufficently new version of the X Render extension. +-- On the X backend, support for RGBA cursors requires a sufficiently new version of the X Render extension. -- cursorNewFromPixbuf :: Display -- ^ @display@ the 'Display' for which the cursor will be created diff --git a/gtk/Graphics/UI/Gtk/Gdk/Display.chs b/gtk/Graphics/UI/Gtk/Gdk/Display.chs index 64c45c345..04c0583cd 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/Display.chs +++ b/gtk/Graphics/UI/Gtk/Gdk/Display.chs @@ -41,7 +41,7 @@ module Graphics.UI.Gtk.Gdk.Display ( -- 'Display' objects are the GDK representation of the X Display which can -- be described as /a workstation consisting of a keyboard a pointing device -- (such as a mouse) and one or more screens/. It is used to open and keep --- track of various 'Screen' objects currently instanciated by the application. +-- track of various 'Screen' objects currently instantiated by the application. -- It is also used to grab and release the keyboard and the mouse pointer. -- * Class Hierarchy @@ -194,7 +194,7 @@ displayGetDefaultScreen self = -- | Release any pointer grab. -- displayPointerUngrab :: Display - -> TimeStamp -- ^ @time@ - a timestap (e.g. 'currentTime'). + -> TimeStamp -- ^ @time@ - a timestamp (e.g. 'currentTime'). -> IO () displayPointerUngrab self time = {# call gdk_display_pointer_ungrab #} @@ -204,7 +204,7 @@ displayPointerUngrab self time = -- | Release any keyboard grab -- displayKeyboardUngrab :: Display - -> TimeStamp -- ^ @time@ - a timestap (e.g 'currentTime'). + -> TimeStamp -- ^ @time@ - a timestamp (e.g 'currentTime'). -> IO () displayKeyboardUngrab self time = {# call gdk_display_keyboard_ungrab #} @@ -245,7 +245,7 @@ displaySync self = -- | Flushes any requests queued for the windowing system; this happens -- automatically when the main loop blocks waiting for new events, but if your -- application is drawing without returning control to the main loop, you may --- need to call this function explicitely. A common case where this function +-- need to call this function explicitly. A common case where this function -- needs to be called is when an application is executing drawing commands from -- a thread other than the thread where the main loop is running. -- @@ -409,7 +409,7 @@ displayWarpPointer self screen x y = #if GTK_CHECK_VERSION(2,4,0) -- | Returns @True@ if multicolored cursors are supported on @display@. --- Otherwise, cursors have only a forground and a background color. +-- Otherwise, cursors have only a foreground and a background color. -- -- * Available since Gdk version 2.4 -- @@ -504,14 +504,14 @@ displayRequestSelectionNotification self (Atom selection) = self selection --- | Returns whether the speicifed display supports clipboard persistance; +-- | Returns whether the speicifed display supports clipboard persistence; -- i.e. if it's possible to store the clipboard data after an application has -- quit. On X11 this checks if a clipboard daemon is running. -- -- * Available since Gdk version 2.6 -- displaySupportsClipboardPersistence :: Display - -> IO Bool -- ^ returns @True@ if the display supports clipboard persistance. + -> IO Bool -- ^ returns @True@ if the display supports clipboard persistence. displaySupportsClipboardPersistence self = liftM toBool $ {# call gdk_display_supports_clipboard_persistence #} diff --git a/gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs b/gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs index 80b15cfa1..53dd11bb9 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs +++ b/gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs @@ -596,7 +596,7 @@ drawWindowSetCursor self cursor = (fromMaybe (Cursor nullForeignPtr) cursor) #if GTK_MAJOR_VERSION < 3 && !defined(HAVE_QUARTZ_GTK) && !defined(GDK_WINDOWING_QUARTZ) --- | Get the handle to an exising window of the windowing system. The +-- | Get the handle to an existing window of the windowing system. The -- passed-in handle is a reference to a native window, that is, an Xlib XID -- for X windows and a HWND for Win32. -- diff --git a/gtk/Graphics/UI/Gtk/Gdk/Drawable.chs b/gtk/Graphics/UI/Gtk/Gdk/Drawable.chs index 109d07eae..29595f390 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/Drawable.chs +++ b/gtk/Graphics/UI/Gtk/Gdk/Drawable.chs @@ -271,7 +271,7 @@ drawPolygon d gc filled points = -- | Draw a segment of text. -- --- * This function draws a segment of text. These segements are the result +-- * This function draws a segment of text. These segments are the result -- of itemizing a string into segments with the same characteristics -- (font, text direction, etc.) using -- 'Graphics.Rendering.Pango.Rendering.itemize'. Each item is then turned diff --git a/gtk/Graphics/UI/Gtk/Gdk/Enums.chs b/gtk/Graphics/UI/Gtk/Gdk/Enums.chs index 8e02e53ab..782b2e9b2 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/Enums.chs +++ b/gtk/Graphics/UI/Gtk/Gdk/Enums.chs @@ -4,7 +4,7 @@ -- -- Author : Manuel M. T. Chakravarty, Axel Simon -- --- Created: 13 Januar 1999 +-- Created: 13 January 1999 -- -- Copyright (C) 1999-2005 Manuel M. T. Chakravarty, Axel Simon -- @@ -115,7 +115,7 @@ instance Flags EventMask -- | Keyboard modifiers that are depressed when the user presses -- a key or a mouse button. -- --- * This data type is used to build lists of modifers that were active +-- * This data type is used to build lists of modifiers that were active -- during an event. -- -- * The "Apple" key on Macintoshs is mapped to 'Alt2' and the 'Meta' diff --git a/gtk/Graphics/UI/Gtk/Gdk/EventM.hsc b/gtk/Graphics/UI/Gtk/Gdk/EventM.hsc index d6380a210..d3f4f662a 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/EventM.hsc +++ b/gtk/Graphics/UI/Gtk/Gdk/EventM.hsc @@ -90,7 +90,7 @@ module Graphics.UI.Gtk.Gdk.EventM ( -- print a message. Note that the return -- value of this statement must be @()@ since 'tryEvent' always -- assumes that the --- function handeled the event if no exception is thrown. A handler +-- function handled the event if no exception is thrown. A handler -- wrapped by 'tryEvent' can also indicate that it cannot handle the -- given event by calling 'stopEvent'. -- @@ -180,7 +180,7 @@ module Graphics.UI.Gtk.Gdk.EventM ( eventGrabWindow, #endif --- * Auxilliary Definitions +-- * Auxiliary Definitions Modifier(..), -- a mask of control keys TimeStamp, currentTime, diff --git a/gtk/Graphics/UI/Gtk/Gdk/Events.hsc b/gtk/Graphics/UI/Gtk/Gdk/Events.hsc index b8252ab1b..652bae677 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/Events.hsc +++ b/gtk/Graphics/UI/Gtk/Gdk/Events.hsc @@ -27,7 +27,7 @@ -- Stability : deprecated -- Portability : portable (depends on GHC) -- --- Definiton of a record that contains event information. Deprecated in +-- Definition of a record that contains event information. Deprecated in -- favor of 'Graphics.UI.Gtk.Gdk.EventM' and not exported by Gtk.hs. -- module Graphics.UI.Gtk.Gdk.Events ( @@ -324,7 +324,7 @@ data Event = -- eventNotifyType :: NotifyType, eventModifier :: [Modifier]} - -- | Gaining or loosing input focus. + -- | Gaining or losing input focus. -- | Focus { eventSent :: Bool, @@ -354,7 +354,7 @@ data Event = -- -- * This action denotes that the content of the widget should be scrolled. -- The event is triggered by the movement of the mouse wheel. Surrounding - -- scroll bars are independant of this signal. Most mice do not have + -- scroll bars are independent of this signal. Most mice do not have -- buttons for horizontal scrolling, hence 'eventDirection' will usually not -- contain 'ScrollLeft' and 'ScrollRight'. Mice with additional -- buttons may not work on X since only five buttons are supported diff --git a/gtk/Graphics/UI/Gtk/Gdk/GC.chs b/gtk/Graphics/UI/Gtk/Gdk/GC.chs index 2b813320b..0cf35ffbf 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/GC.chs +++ b/gtk/Graphics/UI/Gtk/Gdk/GC.chs @@ -163,7 +163,7 @@ gcSetClipRegion = {#call unsafe gc_set_clip_region#} -- -- * Every tuple in the list contains an even and an odd segment. Even -- segments are drawn normally, whereby the 'lineStyle' --- member of the graphics context defines if odd segements are drawn +-- member of the graphics context defines if odd segments are drawn -- or not. A @phase@ argument greater than 0 will drop -- @phase@ pixels before starting to draw. -- diff --git a/gtk/Graphics/UI/Gtk/Gdk/GLContext.chs b/gtk/Graphics/UI/Gtk/Gdk/GLContext.chs index c0e9e2717..be7cd236d 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/GLContext.chs +++ b/gtk/Graphics/UI/Gtk/Gdk/GLContext.chs @@ -178,7 +178,7 @@ glContextGetDebugEnabled self = do -- | Sets whether the 'GLContext' should be forward compatible. -- --- Forward compatibile contexts must not support OpenGL functionality that has been marked as +-- Forward compatible contexts must not support OpenGL functionality that has been marked as -- deprecated in the requested version; non-forward compatible contexts, on the other hand, must -- support both deprecated and non deprecated functionality. -- diff --git a/gtk/Graphics/UI/Gtk/Gdk/Gdk.chs b/gtk/Graphics/UI/Gtk/Gdk/Gdk.chs index a09698a6a..8bd852281 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/Gdk.chs +++ b/gtk/Graphics/UI/Gtk/Gdk/Gdk.chs @@ -180,7 +180,7 @@ keyboardGrab :: (DrawWindowClass window) => -- for this application are reported as normal, but keyboard events -- outside this application are reported with respect to @window@. -- Both key press and key release events are always reported, - -- independant of the event mask set by the application. + -- independent of the event mask set by the application. -> TimeStamp -- ^ @time@ - a timestamp from an 'Event', or 'currentTime' if -- no timestamp is available. -> IO GrabStatus -- ^ @Returns@ - 'GrabSuccess' if the grab was successful. diff --git a/gtk/Graphics/UI/Gtk/Gdk/Keymap.chs b/gtk/Graphics/UI/Gtk/Gdk/Keymap.chs index 20f969055..b05e6c59b 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/Keymap.chs +++ b/gtk/Graphics/UI/Gtk/Gdk/Keymap.chs @@ -317,7 +317,7 @@ keymapHaveBidiLayouts self = #endif #if GTK_CHECK_VERSION(2,16,0) --- | Returns whether the Caps Lock modifer is locked. +-- | Returns whether the Caps Lock modifier is locked. -- -- * Available since Gdk version 2.16 -- diff --git a/gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs b/gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs index db1cac2e3..87d38c8fb 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs +++ b/gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs @@ -196,7 +196,7 @@ pixbufGetBitsPerSample pb = liftM fromIntegral $ -- 'pixbufGetRowstride', indicates the number of bytes between rows. -- -- * The returned array is a flat representation of a three dimensional --- array: x-coordiante, y-coordinate and several channels for each color. +-- array: x-coordinate, y-coordinate and several channels for each color. -- The number of channels is usually 3 for plain RGB data or 4 for -- RGB data with an alpha channel. To read or write a specific pixel -- use the formula: @p = y * rowstride + x * nChannels@ for the pixel. @@ -245,13 +245,13 @@ pixbufGetHeight pb = liftM fromIntegral $ -- | Queries the rowstride of this image. -- -- * Queries the rowstride of a pixbuf, which is the number of bytes between --- rows. Use this value to caculate the offset to a certain row. +-- rows. Use this value to calculate the offset to a certain row. -- pixbufGetRowstride :: Pixbuf -> IO Int pixbufGetRowstride pb = liftM fromIntegral $ {#call unsafe pixbuf_get_rowstride#} pb --- | Returns an attribut of an image. +-- | Returns an attribute of an image. -- -- * Looks up if some information was stored under the @key@ when -- this image was saved. @@ -507,7 +507,7 @@ data InlineImage -- into an object file which must be linked into your Haskell program by -- specifying @my_image.o@ and @\"-#include my_image.h\"@ on -- the command line of GHC. --- Within you application you delcare a pointer to this image: +-- Within you application you declare a pointer to this image: -- -- > foreign label "my_image" myImage :: Ptr InlineImage -- @@ -727,7 +727,7 @@ pixbufAddAlpha pb (Just (r,g,b)) = wrapNewGObject mkPixbuf $ -- | Copy a rectangular portion into another 'Pixbuf'. -- --- The source 'Pixbuf' remains unchanged. Converion between +-- The source 'Pixbuf' remains unchanged. Conversion between -- different formats is done automatically. -- pixbufCopyArea :: diff --git a/gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs b/gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs index 47e0d16a8..58c7fa042 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs +++ b/gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs @@ -75,7 +75,7 @@ type Bitmap = Pixmap -- and @depth@ must not be @Nothing@. -- -- * Note that in Gtk+ 2.0 the @drawable@ can only be a 'DrawWindow', not an --- arbitary 'Drawable'. +-- arbitrary 'Drawable'. -- #if GTK_CHECK_VERSION(2,2,0) pixmapNew :: DrawableClass drawable diff --git a/gtk/Graphics/UI/Gtk/Gdk/Screen.chs b/gtk/Graphics/UI/Gtk/Gdk/Screen.chs index a2614282f..7490c5a37 100644 --- a/gtk/Graphics/UI/Gtk/Gdk/Screen.chs +++ b/gtk/Graphics/UI/Gtk/Gdk/Screen.chs @@ -290,7 +290,7 @@ screenGetWidthMm = screenGetWidthMM -- servers this value will not be correct. -- screenGetHeightMM :: Screen - -> IO Int -- ^ returns the heigth of @screen@ in millimeters. + -> IO Int -- ^ returns the height of @screen@ in millimeters. screenGetHeightMM self = liftM fromIntegral $ {# call gdk_screen_get_height_mm #} diff --git a/gtk/Graphics/UI/Gtk/General/Drag.chs b/gtk/Graphics/UI/Gtk/General/Drag.chs index 96819fb8e..8cfc6d9c0 100644 --- a/gtk/Graphics/UI/Gtk/General/Drag.chs +++ b/gtk/Graphics/UI/Gtk/General/Drag.chs @@ -39,7 +39,7 @@ -- eventTime :: TimeStamp, -- eventModifier :: [Modifier]} -- --- drag_set_icon_pixmap : colormaps are a pain, they migth be useful here +-- drag_set_icon_pixmap : colormaps are a pain, they might be useful here -- drag_set_default_icon : obsolete drag_source_set_icon : colormap problem -- -- | @@ -343,7 +343,7 @@ dragFinish context success del time = -- retrieval fails, GTK+ will emit a 'dragDataReceived' signal. Failure of -- the retrieval is indicated by passing @Nothing@ in the 'selectionData' signal. -- However, when 'dragGetData' is called --- implicitely because the 'DestDefaultDrop' was set, then the widget will +-- implicitly because the 'DestDefaultDrop' was set, then the widget will -- not receive notification of failed drops. -- dragGetData :: (WidgetClass widget, DragContextClass context) @@ -470,7 +470,7 @@ dragSetIconDefault context = -- %hash c:5785 d:af3f -- | Checks to see if a mouse drag starting at @(startX, startY)@ and ending --- at @(currentX, currenty)@ has passed the GTK+ drag threshold, and thus +-- at @(currentX, currentY)@ has passed the GTK+ drag threshold, and thus -- should trigger the beginning of a drag-and-drop operation. -- dragCheckThreshold :: WidgetClass widget => widget diff --git a/gtk/Graphics/UI/Gtk/General/Enums.chs b/gtk/Graphics/UI/Gtk/General/Enums.chs index 4c081ec04..131768427 100644 --- a/gtk/Graphics/UI/Gtk/General/Enums.chs +++ b/gtk/Graphics/UI/Gtk/General/Enums.chs @@ -148,10 +148,10 @@ instance Flags AttachOptions #if GTK_CHECK_VERSION(3,10,0) -- | Whenever a container has some form of natural row it may align children in --- that row along a common typographical baseline. If the amount of verical space +-- that row along a common typographical baseline. If the amount of vertical space -- in the row is taller than the total requested height of the baseline-aligned -- children then it can use a BaselinePosition to select where to put the --- baseline inside the extra availible space. +-- baseline inside the extra available space. -- {#enum BaselinePosition {underscoreToCase} deriving (Eq,Show)#} #endif @@ -343,7 +343,7 @@ fromPacking PackNatural = (False,False) {#enum PolicyType {underscoreToCase} deriving (Eq,Show)#} -- | Position a scale's value is drawn relative to the --- trough +-- through -- {#enum PositionType {underscoreToCase} deriving (Eq,Show)#} @@ -467,7 +467,7 @@ instance Flags TextSearchFlags -- {#enum ToolbarStyle {underscoreToCase} deriving (Eq,Show)#} --- | Wether columns of a tree or list widget can be resized. +-- | Whether columns of a tree or list widget can be resized. -- {#enum TreeViewColumnSizing {underscoreToCase} deriving (Eq,Show)#} diff --git a/gtk/Graphics/UI/Gtk/General/General.chs b/gtk/Graphics/UI/Gtk/General/General.chs index b8f0809dc..df6c1045e 100644 --- a/gtk/Graphics/UI/Gtk/General/General.chs +++ b/gtk/Graphics/UI/Gtk/General/General.chs @@ -101,7 +101,7 @@ import Control.Monad.Trans (liftIO) {#context lib="gtk" prefix ="gtk"#} {- --- | Retreive the current language. +-- | Retrieve the current language. -- * This function returns a String which's pointer can be used later on for -- comarisions. -- @@ -115,7 +115,7 @@ import Control.Monad.Trans (liftIO) unsafeInitGUIForThreadedRTS = initGUI --- We compile this module using -#includ"gtk/wingtk.h" to bypass the win32 abi +-- We compile this module using -#include"gtk/wingtk.h" to bypass the win32 abi -- check however we do not compile users programs with this header so if -- initGUI was ever inlined in a users program, then that program would not -- bypass the abi check and would fail on startup. So to stop that we must diff --git a/gtk/Graphics/UI/Gtk/General/IconFactory.chs b/gtk/Graphics/UI/Gtk/General/IconFactory.chs index 396e535f7..a63ef0948 100644 --- a/gtk/Graphics/UI/Gtk/General/IconFactory.chs +++ b/gtk/Graphics/UI/Gtk/General/IconFactory.chs @@ -224,7 +224,7 @@ iconSetRenderIcon set dir state size widget = wrapNewGObject mkPixbuf $ -- -- * Each icon in an application is contained in an 'IconSet'. The -- 'IconSet' contains several variants ('IconSource's) to --- accomodate for different sizes and states. +-- accommodate for different sizes and states. -- iconSetNew :: IO IconSet iconSetNew = do @@ -260,7 +260,7 @@ foreign import ccall unsafe ">k_icon_set_unref" -- | Check if a given IconSize is registered. -- -- * Useful if your application expects a theme to install a set with a --- specific size. You can test if this actually happend and use another size +-- specific size. You can test if this actually happens and use another size -- if not. -- iconSizeCheck :: IconSize -> IO Bool diff --git a/gtk/Graphics/UI/Gtk/General/IconTheme.chs b/gtk/Graphics/UI/Gtk/General/IconTheme.chs index ac717cc53..7400aa6a1 100644 --- a/gtk/Graphics/UI/Gtk/General/IconTheme.chs +++ b/gtk/Graphics/UI/Gtk/General/IconTheme.chs @@ -33,7 +33,7 @@ module Graphics.UI.Gtk.General.IconTheme ( -- -- | 'IconTheme' provides a facility for looking up icons by name and size. The main reason for using a -- name rather than simply providing a filename is to allow different icons to be used depending on --- what icon theme is selecetd by the user. The operation of icon themes on Linux and Unix follows the +-- what icon theme is selected by the user. The operation of icon themes on Linux and Unix follows the -- Icon Theme Specification. There is a default icon theme, named hicolor where applications should -- install their icons, but more additional application themes can be installed as operating system -- vendors and users choose. diff --git a/gtk/Graphics/UI/Gtk/General/RcStyle.chs b/gtk/Graphics/UI/Gtk/General/RcStyle.chs index 43fc921c2..7dceaef68 100644 --- a/gtk/Graphics/UI/Gtk/General/RcStyle.chs +++ b/gtk/Graphics/UI/Gtk/General/RcStyle.chs @@ -120,7 +120,7 @@ module Graphics.UI.Gtk.General.RcStyle ( -- ** Optimizing RC Style Matches -- --- | Everytime a widget is created and added to the layout hierarchy of a +-- | Every time a widget is created and added to the layout hierarchy of a -- 'Window' (\"anchored\" to be exact), a list of matching RC styles out of all -- RC styles read in so far is composed. For this, every RC style is matched -- against the widgets class path, the widgets name path and widgets @@ -276,7 +276,7 @@ module Graphics.UI.Gtk.General.RcStyle ( -- [@NORMAL@] A color used for a widget in its normal state. -- -- [@ACTIVE@] A variant of the @NORMAL@ color used when the widget is in the --- 'StateActive' state, and also for the trough of a ScrollBar, tabs of a +-- 'StateActive' state, and also for the through of a ScrollBar, tabs of a -- NoteBook other than the current tab and similar areas. Frequently, this -- should be a darker variant of the @NORMAL@ color. -- @@ -298,7 +298,7 @@ module Graphics.UI.Gtk.General.RcStyle ( -- g, b}@, where @r@, @g@ and @b@ are either integers in the range 0-65535 or -- floats in the range 0.0-1.0. -- --- Since 2.10, colors can also be specified by refering to a symbolic color, +-- Since 2.10, colors can also be specified by referring to a symbolic color, -- as follows: @\@color-name@, or by using expressions to combine colors. The -- following expressions are currently supported: -- @@ -620,7 +620,7 @@ rcReparseAllForSettings settings forceLoad = -- gets a new style, it will both redraw and recompute any cached information -- about its appearance. As an example, it is used when the default font size -- set by the operating system changes. Note that this function doesn't affect --- widgets that have a style set explicitely on them with 'widgetSetStyle'. +-- widgets that have a style set explicitly on them with 'widgetSetStyle'. -- rcResetStyles :: Settings -> IO () rcResetStyles settings = diff --git a/gtk/Graphics/UI/Gtk/General/Selection.chs b/gtk/Graphics/UI/Gtk/General/Selection.chs index 970d47a44..1dae7c73a 100644 --- a/gtk/Graphics/UI/Gtk/General/Selection.chs +++ b/gtk/Graphics/UI/Gtk/General/Selection.chs @@ -282,7 +282,7 @@ selectionDataGet_target selPtr = {#get SelectionData -> target#} selPtr #endif #if GTK_MAJOR_VERSION < 3 --- | Retreives the data in the 'SelectionDataM' monad. The returned array +-- | Retrieves the data in the 'SelectionDataM' monad. The returned array -- must have elements of the size that were used to set this data. If -- the size or the type tag does not match, @Nothing@ is returned. -- diff --git a/gtk/Graphics/UI/Gtk/General/Structs.hsc b/gtk/Graphics/UI/Gtk/General/Structs.hsc index 488bbc89e..77497747f 100644 --- a/gtk/Graphics/UI/Gtk/General/Structs.hsc +++ b/gtk/Graphics/UI/Gtk/General/Structs.hsc @@ -618,7 +618,7 @@ toResponse (-11) = ResponseHelp toResponse i = ResponseUser $ fromIntegral i #if !defined(WIN32) || GTK_CHECK_VERSION(2,8,0) --- | The identifer of a window of the underlying windowing system. +-- | The identifier of a window of the underlying windowing system. -- #if defined(GDK_NATIVE_WINDOW_POINTER) && !defined(HAVE_QUARTZ_GTK) && !defined(GDK_WINDOWING_QUARTZ) --GDK Quartz also defined GDK_NATIVE_WINDOW_POINTER @@ -806,7 +806,7 @@ fileSelectionGetButtons fsel = -- | Retrieves the 'DrawWindow' that the widget draws onto. -- --- This function thows an error if the widget has not yet been realized, since +-- This function throws an error if the widget has not yet been realized, since -- a widget does not allocate its window resources until just before it is -- displayed on the screen. You can use the -- 'Graphics.UI.Gtk.Abstract.Widget.onRealize' signal to give you the @@ -939,7 +939,7 @@ styleGetBase st ty = -- | Retrieve the color for drawing anti-aliased text. -- -- * The anti-aliasing color is the color which is used when the rendering --- of a character does not make it clear if a certain pixel shoud be set +-- of a character does not make it clear if a certain pixel should be set -- or not. This color is between the text and the base color. -- -- * The parameter @state@ determines for which widget diff --git a/gtk/Graphics/UI/Gtk/General/StyleProvider.chs b/gtk/Graphics/UI/Gtk/General/StyleProvider.chs index d91f885c1..b79b9228b 100644 --- a/gtk/Graphics/UI/Gtk/General/StyleProvider.chs +++ b/gtk/Graphics/UI/Gtk/General/StyleProvider.chs @@ -34,7 +34,7 @@ module Graphics.UI.Gtk.General.StyleProvider ( -- -- @StyleProvider@ is implemented by @CssProvider@ and @Settings@. #if GTK_MAJOR_VERSION >= 3 --- * Typess +-- * Types StyleProvider, StyleProviderClass, castToStyleProvider, gTypeStyleProvider, diff --git a/gtk/Graphics/UI/Gtk/General/hsgthread.c b/gtk/Graphics/UI/Gtk/General/hsgthread.c index 67235c289..352915579 100644 --- a/gtk/Graphics/UI/Gtk/General/hsgthread.c +++ b/gtk/Graphics/UI/Gtk/General/hsgthread.c @@ -70,7 +70,7 @@ void imp_rec_unlock() { /* Initialize the default _fmode on WIN32. */ void gtk2hs_initialise (void) { #if defined( WIN32 ) && defined( GTK2HS_SET_FMODE_BINARY ) - /* Some Windows GTK binraries (current Fedora MinGW ones) do */ + /* Some Windows GTK binaries (current Fedora MinGW ones) do */ /* not open files in binary mode. This is a work around. */ HANDLE handle = LoadLibrary("MSVCRT.dll"); if(!handle) { diff --git a/gtk/Graphics/UI/Gtk/Layout/Overlay.chs b/gtk/Graphics/UI/Gtk/Layout/Overlay.chs index 21d1ba87e..740f51fe4 100644 --- a/gtk/Graphics/UI/Gtk/Layout/Overlay.chs +++ b/gtk/Graphics/UI/Gtk/Layout/Overlay.chs @@ -24,7 +24,7 @@ -- Stability : provisional -- Portability : portable (depends on GHC) -- --- A simple container that can display overlayed widgets +-- A simple container that can display overlaid widgets -- module Graphics.UI.Gtk.Layout.Overlay ( -- * Detail diff --git a/gtk/Graphics/UI/Gtk/Layout/Stack.chs b/gtk/Graphics/UI/Gtk/Layout/Stack.chs index 77a10c53e..019ea3e45 100644 --- a/gtk/Graphics/UI/Gtk/Layout/Stack.chs +++ b/gtk/Graphics/UI/Gtk/Layout/Stack.chs @@ -339,7 +339,7 @@ stackGetTransitionRunning self = (toStack self) #if GTK_CHECK_VERSION(3,18,0) --- | Returns wether the stack is set up to interpolate between the +-- | Returns whether the stack is set up to interpolate between the -- sizes of children on page switch. stackGetInterpolateSize :: StackClass self => self -> IO Bool stackGetInterpolateSize self = diff --git a/gtk/Graphics/UI/Gtk/Layout/Table.chs b/gtk/Graphics/UI/Gtk/Layout/Table.chs index 02baf8cf6..23bfaf133 100644 --- a/gtk/Graphics/UI/Gtk/Layout/Table.chs +++ b/gtk/Graphics/UI/Gtk/Layout/Table.chs @@ -309,7 +309,7 @@ tableGetDefaultColSpacing self = {# call unsafe table_get_default_col_spacing #} (toTable self) --- | Changes the homogenous property of table cells, ie. whether all cells are +-- | Changes the homogeneous property of table cells, ie. whether all cells are -- an equal size or not. -- tableSetHomogeneous :: TableClass self => self diff --git a/gtk/Graphics/UI/Gtk/MenuComboToolbar/CheckMenuItem.chs b/gtk/Graphics/UI/Gtk/MenuComboToolbar/CheckMenuItem.chs index 469a23073..44f5d4da7 100644 --- a/gtk/Graphics/UI/Gtk/MenuComboToolbar/CheckMenuItem.chs +++ b/gtk/Graphics/UI/Gtk/MenuComboToolbar/CheckMenuItem.chs @@ -173,7 +173,7 @@ checkMenuItemSetInconsistent self setting = (toCheckMenuItem self) (fromBool setting) --- | Query if the menu check is drawn as inconsistent (inbetween). See +-- | Query if the menu check is drawn as inconsistent (in between). See -- 'checkMenuItemSetInconsistent'. -- checkMenuItemGetInconsistent :: CheckMenuItemClass self => self -> IO Bool diff --git a/gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs b/gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs index d844f1281..a2217ef62 100644 --- a/gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs +++ b/gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs @@ -256,7 +256,7 @@ comboBoxNewWithModelAndEntry model = -- widget and sets the model to the list store. The widget can contain only -- strings. The model can be retrieved with 'comboBoxGetModel'. The list -- store can be retrieved with 'comboBoxGetModelText'. --- Any exisiting model or renderers are removed before setting the new text +-- Any existing model or renderers are removed before setting the new text -- model. -- Note that the functions 'comboBoxAppendText', 'comboBoxInsertText', -- 'comboBoxPrependText', 'comboBoxRemoveText' and 'comboBoxGetActiveText' diff --git a/gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs b/gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs index 9acbebc74..0ca974b7f 100644 --- a/gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs +++ b/gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs @@ -153,7 +153,7 @@ comboBoxEntryNewWithModel model = do -- widget and sets the model to the list store. The widget can contain only -- strings. The model can be retrieved with 'comboBoxGetModel'. The list -- store can be retrieved with 'comboBoxGetModelText'. --- Any exisiting model or renderers are removed before setting the new text +-- Any existing model or renderers are removed before setting the new text -- model. -- In order to respond to new texts that the user enters, it is necessary to -- connect to the 'Graphics.UI.Gtk.Entry.Entry.entryActivated' signal of the @@ -203,7 +203,7 @@ comboBoxEntryGetTextColumn self = -- -- * Returns @Nothing@ if no text is selected or entered. -- --- * Availabe in Gtk 2.6 or higher. +-- * Available in Gtk 2.6 or higher. -- comboBoxEntryGetActiveText :: (ComboBoxEntryClass self, GlibString string) => self -> IO (Maybe string) diff --git a/gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs b/gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs index 217fc835f..be760e4e1 100644 --- a/gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs +++ b/gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs @@ -25,8 +25,8 @@ -- -- The function menuPopup at a specific position is difficult to bind: -- The callback function that determines at which position the menu is --- to be shown is keept after the call returns. Maybe we could destroy --- this function pointer with a destory event? +-- to be shown is kept after the call returns. Maybe we could destroy +-- this function pointer with a destroy event? -- -- | -- Maintainer : gtk2hs-users@lists.sourceforge.net @@ -215,7 +215,7 @@ menuGetAccelGroup self = -- its immediate children, its menu items, can be constructed. The main purpose -- of this function is to spare the programmer the inconvenience of having to -- call 'menuItemSetAccelPath' on each menu item that should support runtime --- user changable accelerators. Instead, by just calling 'menuSetAccelPath' on +-- user changeable accelerators. Instead, by just calling 'menuSetAccelPath' on -- their parent, each menu item of this menu, that contains a label describing -- its purpose, automatically gets an accel path assigned. -- diff --git a/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs b/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs index 8c5282d12..448406ad8 100644 --- a/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs +++ b/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs @@ -42,11 +42,11 @@ module Graphics.UI.Gtk.MenuComboToolbar.MenuItem ( -- * Detail -- --- | The 'MenuItem' widget and the derived widgets are the only valid childs +-- | The 'MenuItem' widget and the derived widgets are the only valid children -- for menus. Their function is to correctly handle highlighting, alignment, -- events and submenus. -- --- As it derives from 'Bin' it can hold any valid child widget, altough only +-- As it derives from 'Bin' it can hold any valid child widget, although only -- a few are really useful. -- * Class Hierarchy @@ -282,7 +282,7 @@ menuItemGetRightJustified self = -- | Set the accelerator path on the menu item, through which runtime changes of -- the menu item's accelerator caused by the user can be identified and saved --- to persistant storage (see 'accelMapSave' on this). To setup a default +-- to persistent storage (see 'accelMapSave' on this). To setup a default -- accelerator for this menu item, call 'accelMapAddEntry' with the same accel -- path. See also 'accelMapAddEntry' on the specifics of accelerator paths, and -- 'menuSetAccelPath' for a more convenient variant of this function. diff --git a/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuShell.chs b/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuShell.chs index 870014915..267ff9ba0 100644 --- a/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuShell.chs +++ b/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuShell.chs @@ -219,7 +219,7 @@ menuShellCancel self = -- to submenus whenever a submenu is popped up, so you don't have to worry -- about recursively setting it for your entire menu hierarchy. Only when -- programmatically picking a submenu and popping it up manually, the --- @takeFocus@ property of the submenu needs to be set explicitely. +-- @takeFocus@ property of the submenu needs to be set explicitly. -- -- Note that setting it to @False@ has side-effects: -- diff --git a/gtk/Graphics/UI/Gtk/MenuComboToolbar/RadioMenuItem.chs b/gtk/Graphics/UI/Gtk/MenuComboToolbar/RadioMenuItem.chs index 1e68ed606..33a0a6dae 100644 --- a/gtk/Graphics/UI/Gtk/MenuComboToolbar/RadioMenuItem.chs +++ b/gtk/Graphics/UI/Gtk/MenuComboToolbar/RadioMenuItem.chs @@ -63,7 +63,7 @@ module Graphics.UI.Gtk.MenuComboToolbar.RadioMenuItem ( radioMenuItemNewWithLabelFromWidget, radioMenuItemNewWithMnemonicFromWidget, - -- * Compatibilty aliases + -- * Compatibility aliases radioMenuItemNewJoinGroup, radioMenuItemNewJoinGroupWithLabel, radioMenuItemNewJoinGroupWithMnemonic, diff --git a/gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItemGroup.chs b/gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItemGroup.chs index 859f5ff1b..71455dcbb 100644 --- a/gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItemGroup.chs +++ b/gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItemGroup.chs @@ -187,7 +187,7 @@ toolItemGroupSetItemPosition group item position = (toToolItem item) (fromIntegral position) --- | Wether the group has been collapsed and items are hidden. +-- | Whether the group has been collapsed and items are hidden. -- -- Default value: 'False' -- diff --git a/gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs b/gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs index c8d88f391..f88ddd45c 100644 --- a/gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs +++ b/gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs @@ -28,7 +28,7 @@ module Graphics.UI.Gtk.MenuComboToolbar.Toolbar ( -- * Detail -- --- | This widget underwent a signficant overhaul in gtk 2.4 and the +-- | This widget underwent a significant overhaul in gtk 2.4 and the -- recommended api changed substantially. The old interface is still supported -- but it is not recommended. -- @@ -52,7 +52,7 @@ module Graphics.UI.Gtk.MenuComboToolbar.Toolbar ( #ifndef DISABLE_DEPRECATED -- | * The following information applies to the old interface only. -- --- 'Button's, 'RadioButton's and 'ToggleButton's can be added by refering to +-- 'Button's, 'RadioButton's and 'ToggleButton's can be added by referring to -- stock images. Their size can be changed by calling 'toolbarSetIconSize'. In -- contrast, normal widget cannot be added. Due to the bad interface of -- "Toolbar" mnemonics of 'RadioButton's and 'ToggleButton's are not honored. @@ -221,7 +221,7 @@ mkToolText (Just (text,private)) fun = withUTFString text $ \txtPtr -> -- which must be a valid entry in the 'Toolbar's Style or the -- default 'IconFactory'. -- --- If you whish to have 'Tooltips' added to this button you can +-- If you wish to have 'Tooltips' added to this button you can -- specify @Just (tipText, tipPrivate)@ , otherwise specify @Nothing@. -- -- The newly created 'Button' is returned. Use this button to @@ -341,7 +341,7 @@ toolbarPrependNewToggleButton self = toolbarInsertNewToggleButton self 0 -- -- The @parent@ argument must be set to another -- 'RadioButton' in the group. If @Nothing@ is given, --- a new group is generated (which is the desired behavious for the +-- a new group is generated (which is the desired behaviour for the -- first button of a group). -- -- * Warning: this function is deprecated and should not be used in @@ -764,7 +764,7 @@ afterStyleChanged = connect_ENUM__NONE "style-changed" True -- Application developers should handle this signal if they want to display -- a context menu on the toolbar. The context-menu should appear at the -- coordinates given by @x@ and @y@. The mouse button number is given by the --- @button@ parameter. If the menu was popped up using the keybaord, @button@ +-- @button@ parameter. If the menu was popped up using the keyboard, @button@ -- is -1. -- onPopupContextMenu, afterPopupContextMenu :: ToolbarClass self => self diff --git a/gtk/Graphics/UI/Gtk/Misc/Arrow.chs b/gtk/Graphics/UI/Gtk/Misc/Arrow.chs index 35de6e44e..303430b54 100644 --- a/gtk/Graphics/UI/Gtk/Misc/Arrow.chs +++ b/gtk/Graphics/UI/Gtk/Misc/Arrow.chs @@ -31,10 +31,10 @@ module Graphics.UI.Gtk.Misc.Arrow ( -- | 'Arrow' should be used to draw simple arrows that need to point in one of -- the four cardinal directions (up, down, left, or right). The style of the -- arrow can be one of shadow in, shadow out, etched in, or etched out. Note --- that these directions and style types may be ammended in versions of Gtk to +-- that these directions and style types may be amended in versions of Gtk to -- come. -- --- 'Arrow' will fill any space alloted to it, but since it is inherited from +-- 'Arrow' will fill any space allotted to it, but since it is inherited from -- 'Misc', it can be padded and\/or aligned, to fill exactly the space the -- programmer desires. -- diff --git a/gtk/Graphics/UI/Gtk/Misc/GLArea.chs b/gtk/Graphics/UI/Gtk/Misc/GLArea.chs index 1cb166492..be6bcf3d3 100644 --- a/gtk/Graphics/UI/Gtk/Misc/GLArea.chs +++ b/gtk/Graphics/UI/Gtk/Misc/GLArea.chs @@ -172,7 +172,7 @@ glAreaQueueRender self = -- | Ensures that the area framebuffer object is made the current draw and read -- target, and that all the required buffers for the area are created and --- bound to the frambuffer. +-- bound to the framebuffer. -- -- This function is automatically called before emitting the 'glAreaRender' signal, -- and doesn't normally need to be called by application code. diff --git a/gtk/Graphics/UI/Gtk/Misc/HandleBox.chs b/gtk/Graphics/UI/Gtk/Misc/HandleBox.chs index 957d6f7f8..350ce4d9b 100644 --- a/gtk/Graphics/UI/Gtk/Misc/HandleBox.chs +++ b/gtk/Graphics/UI/Gtk/Misc/HandleBox.chs @@ -37,12 +37,12 @@ module Graphics.UI.Gtk.Misc.HandleBox ( -- -- When reattaching, the ghost and float window, must be aligned along one -- of the edges, the snap edge. This either can be specified by the application --- programmer explicitely, or Gtk+ will pick a reasonable default based on the +-- programmer explicitly, or Gtk+ will pick a reasonable default based on the -- handle position. -- -- To make detaching and reattaching the handlebox as minimally confusing as -- possible to the user, it is important to set the snap edge so that the snap --- edge does not move when the handlebox is deattached. For instance, if the +-- edge does not move when the handlebox is detached. For instance, if the -- handlebox is packed at the bottom of a VBox, then when the handlebox is -- detached, the bottom edge of the handlebox's allocation will remain fixed as -- the height of the handlebox shrinks, so the snap edge should be set to @@ -227,7 +227,7 @@ handleBoxSnapEdgeSet = newAttrFromBoolProperty "snap-edge-set" -------------------- -- Signals --- Note: for these two signales we ignore the given Widget in the handler. +-- Note: for these two signals we ignore the given Widget in the handler. -- | This signal is emitted when the contents of the handlebox are reattached -- to the main window. diff --git a/gtk/Graphics/UI/Gtk/Misc/Switch.chs b/gtk/Graphics/UI/Gtk/Misc/Switch.chs index e19ccf3d4..17ebe7e15 100644 --- a/gtk/Graphics/UI/Gtk/Misc/Switch.chs +++ b/gtk/Graphics/UI/Gtk/Misc/Switch.chs @@ -185,7 +185,7 @@ switchActivate = Signal (connect_NONE__NONE "activate") -- when the underlying state change is complete. -- The signal handler should return @True@ to prevent the default handler from running. -- --- Visually, the underlying state is represented by the trough color of the switch, +-- Visually, the underlying state is represented by the through color of the switch, -- while the 'switchActive' property is represented by the position of the switch. -- stateSet :: SwitchClass self => Signal self (Bool -> IO Bool) diff --git a/gtk/Graphics/UI/Gtk/Misc/Tooltips.chs b/gtk/Graphics/UI/Gtk/Misc/Tooltips.chs index c7bce9759..a6c691207 100644 --- a/gtk/Graphics/UI/Gtk/Misc/Tooltips.chs +++ b/gtk/Graphics/UI/Gtk/Misc/Tooltips.chs @@ -95,7 +95,7 @@ import Graphics.UI.Gtk.Abstract.Object (makeNewObject) -------------------- -- Constructors --- | Create a new goup of 'Tooltips'. +-- | Create a new group of 'Tooltips'. -- tooltipsNew :: IO Tooltips tooltipsNew = diff --git a/gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs b/gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs index 7fcf2e972..05910f3a1 100644 --- a/gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs +++ b/gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs @@ -306,7 +306,7 @@ editingCanceled = Signal (connect_NONE__NONE "editing-canceled") #if GTK_CHECK_VERSION(2,6,0) -- %hash c:41f0 d:49f --- | This signal gets emitted when a cell starts to be edited. The indended +-- | This signal gets emitted when a cell starts to be edited. The intended -- use of this signal is to do special setup on @editable@, e.g. adding a -- 'EntryCompletion' or setting up additional columns in a 'ComboBox'. -- diff --git a/gtk/Graphics/UI/Gtk/ModelView/CellRendererText.chs b/gtk/Graphics/UI/Gtk/ModelView/CellRendererText.chs index ab172cca8..9d2ac5317 100644 --- a/gtk/Graphics/UI/Gtk/ModelView/CellRendererText.chs +++ b/gtk/Graphics/UI/Gtk/ModelView/CellRendererText.chs @@ -154,7 +154,7 @@ cellRendererTextNew = -- 'cellTextFont' and 'Graphics.UI.Gtk.ModelView.CellRenderer.cellYPad' -- attribute set on it. Further changes in these properties do not affect the -- height, so they must be accompanied by a subsequent call to this function. --- Using this function is unflexible, and should really only be used if +-- Using this function is inflexible, and should really only be used if -- calculating the size of a cell is too slow (ie, a massive number of cells -- displayed). If @numberOfRows@ is -1, then the fixed height is unset, and -- the height is determined by the properties again. diff --git a/gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs b/gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs index 20754a39a..3e2b64b33 100644 --- a/gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs +++ b/gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs @@ -45,7 +45,7 @@ module Graphics.UI.Gtk.ModelView.CustomStore ( customStoreGetPrivate, customStoreGetStamp, customStoreInvalidateIters, - -- for backwards compatability, not documented + -- for backwards compatibility, not documented treeModelGetRow, treeModelSetColumn, ) where @@ -129,7 +129,7 @@ customStoreSetColumn model (ColumnId _ setter colId) acc | colId<0 = return () let (beg,_:end) = splitAt colId cols writeIORef cMap (beg++setter acc:end) --- this is a backwards compatability definition +-- this is a backwards compatibility definition treeModelSetColumn :: TypedTreeModelClass model => model row -- ^ the store in which to allocate a new column -> (ColumnId row ty) -- ^ the column that should be set @@ -153,7 +153,7 @@ data TreeModelIface row = TreeModelIface { -- Return @Nothing@ if the path does not exit. treeModelIfaceGetIter :: TreePath -> IO (Maybe TreeIter), -- convert a path to an iterator -- | Convert an iterator to a path. The iterator will always be valid. - treeModelIfaceGetPath :: TreeIter -> IO TreePath, -- convert an interator to a path + treeModelIfaceGetPath :: TreeIter -> IO TreePath, -- convert an iterator to a path -- | Retrieve a row at the given iterator. treeModelIfaceGetRow :: TreeIter -> IO row, -- get the row at an iter -- | Advance the given iterator to the next node at the same level. @@ -252,7 +252,7 @@ customStoreGetRow model iter = impl <- withForeignPtr model gtk2hs_store_get_impl >>= deRefStablePtr treeModelIfaceGetRow (customStoreIface impl) iter --- this is a backwards compatability definition +-- this is a backwards compatibility definition treeModelGetRow :: TypedTreeModelClass model => model row -> TreeIter -> IO row treeModelGetRow = customStoreGetRow diff --git a/gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c b/gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c index ebc07f6cb..a6ac28eee 100644 --- a/gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c +++ b/gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c @@ -274,7 +274,7 @@ gtk2hs_store_tree_drag_dest_init (GtkTreeDragDestIface *iface) /** * - * gtk2hs_store_init: this is called everytime a new custom list object + * gtk2hs_store_init: this is called every time a new custom list object * instance is created (we do that in gtk2hs_store_new). * Initialise the list structure's fields here. * diff --git a/gtk/Graphics/UI/Gtk/ModelView/IconView.chs b/gtk/Graphics/UI/Gtk/ModelView/IconView.chs index f051830b5..7fd22fe6b 100644 --- a/gtk/Graphics/UI/Gtk/ModelView/IconView.chs +++ b/gtk/Graphics/UI/Gtk/ModelView/IconView.chs @@ -304,7 +304,7 @@ iconViewGetPathAtPos self x y = -- cannot be modified from within this function. -- iconViewSelectedForeach :: IconViewClass self => self - -> (TreePath -> IO ()) -- ^ @(\path -> ...)@ - The funcion to call for each + -> (TreePath -> IO ()) -- ^ @(\path -> ...)@ - The function to call for each -- selected icon. -> IO () iconViewSelectedForeach self func = do @@ -700,7 +700,7 @@ iconViewScrollToPath self path useAlign rowAlign colAlign = -- %hash c:8354 d:f7f3 -- | Retrieve the first and last visible path. --- Note that there may be invisible paths inbetween. +-- Note that there may be invisible paths in between. -- -- * Available since Gtk+ version 2.8 -- diff --git a/gtk/Graphics/UI/Gtk/ModelView/ListStore.hs b/gtk/Graphics/UI/Gtk/ModelView/ListStore.hs index 799b2794d..cd358e5b1 100644 --- a/gtk/Graphics/UI/Gtk/ModelView/ListStore.hs +++ b/gtk/Graphics/UI/Gtk/ModelView/ListStore.hs @@ -4,7 +4,7 @@ -- -- Author : Duncan Coutts, Axel Simon -- --- Created: 11 Feburary 2006 +-- Created: 11 February 2006 -- -- Copyright (C) 2005 Duncan Coutts, Axel Simon -- @@ -284,9 +284,9 @@ listStoreClear :: ListStore a -> IO () listStoreClear (ListStore model) = -- Since deleting rows can cause callbacks (eg due to selection changes) - -- we have to make sure the model is consitent with the view at each + -- we have to make sure the model is consistent with the view at each -- intermediate step of clearing the store. Otherwise at some intermediate - -- stage when the view has only been informed about some delections, the + -- stage when the view has only been informed about some deletions, the -- user might query the model expecting to find the remaining rows are there -- but find them deleted. That'd be bad. -- diff --git a/gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs b/gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs index efbc6e222..bd700404f 100644 --- a/gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs +++ b/gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs @@ -160,7 +160,7 @@ treeSelectionSetSelectFunction ts fun = do (castFunPtrToPtr fPtr) destroyFunPtr --- | Callback type for a function that is called everytime the selection +-- | Callback type for a function that is called every time the selection -- changes. This function is set with 'treeSelectionSetSelectFunction'. -- type TreeSelectionCB = TreePath -> IO Bool diff --git a/gtk/Graphics/UI/Gtk/ModelView/TreeStore.hs b/gtk/Graphics/UI/Gtk/ModelView/TreeStore.hs index 5585df167..07f1698ef 100644 --- a/gtk/Graphics/UI/Gtk/ModelView/TreeStore.hs +++ b/gtk/Graphics/UI/Gtk/ModelView/TreeStore.hs @@ -4,7 +4,7 @@ -- -- Author : Duncan Coutts, Axel Simon -- --- Created: 11 Feburary 2006 +-- Created: 11 February 2006 -- -- Copyright (C) 2005 Duncan Coutts, Axel Simon -- @@ -126,7 +126,7 @@ treeStoreNew forest = treeStoreNewDND forest -- * In addition to 'treeStoreNew', this function takes an two interfaces -- to implement user-defined drag-and-drop functionality. -- -treeStoreNewDND :: Forest a -- ^ the inital tree stored in this model +treeStoreNewDND :: Forest a -- ^ the initial tree stored in this model -> Maybe (DragSourceIface TreeStore a) -- ^ an optional interface for drags -> Maybe (DragDestIface TreeStore a) -- ^ an optional interface to handle drops -> IO (TreeStore a) @@ -691,7 +691,7 @@ treeStoreGetTree (TreeStore model) path = do _ -> fail ("treeStoreGetTree: path does not exist " ++ show path) -- | Extract a subtree from the current model. Like 'treeStoreGetTree' --- but returns @Nothing@ if the path refers to a non-existant node. +-- but returns @Nothing@ if the path refers to a non-existent node. -- treeStoreLookup :: TreeStore a -> TreePath -> IO (Maybe (Tree a)) treeStoreLookup (TreeStore model) path = do diff --git a/gtk/Graphics/UI/Gtk/ModelView/TreeView.chs b/gtk/Graphics/UI/Gtk/ModelView/TreeView.chs index 4ad282479..f65f094f8 100644 --- a/gtk/Graphics/UI/Gtk/ModelView/TreeView.chs +++ b/gtk/Graphics/UI/Gtk/ModelView/TreeView.chs @@ -393,7 +393,7 @@ treeViewColumnsAutosize self = {# call tree_view_columns_autosize #} (toTreeView self) --- | Set wether the columns headers are sensitive to mouse clicks. +-- | Set whether the columns headers are sensitive to mouse clicks. -- treeViewSetHeadersClickable :: TreeViewClass self => self -> Bool -> IO () treeViewSetHeadersClickable self setting = @@ -683,7 +683,7 @@ treeViewSetCursor self path (Just (focusColumn, startEditing)) = -- | Selects a cell in a specific row. -- -- * Similar to 'treeViewSetCursor' but allows a column to --- containt several 'CellRenderer's. +-- contain several 'CellRenderer's. -- -- * Only available in Gtk 2.2 and higher. -- @@ -793,7 +793,7 @@ treeViewCollapseRow self path = (toTreeView self) path --- | Call function for every expaned row. +-- | Call function for every expanded row. -- treeViewMapExpandedRows :: TreeViewClass self => self -> (TreePath -> IO ()) @@ -975,7 +975,7 @@ treeViewGetVisibleRect self = #ifndef DISABLE_DEPRECATED #if GTK_MAJOR_VERSION < 3 -- | 'treeViewTreeToWidgetCoords' has been deprecated since version 2.12 and should not be used in --- newly-written code. Due to historial reasons the name of this function is incorrect. For converting +-- newly-written code. Due to historical reasons the name of this function is incorrect. For converting -- bin window coordinates to coordinates relative to bin window, please see -- 'treeViewConvertBinWindowToWidgetCoords'. -- @@ -1000,7 +1000,7 @@ treeViewTreeToWidgetCoords self (tx, ty) = return (fromIntegral wx, fromIntegral wy) -- | 'treeViewWidgetToTreeCoords' has been deprecated since version 2.12 and should not be used in --- newly-written code. Due to historial reasons the name of this function is incorrect. For converting +-- newly-written code. Due to historical reasons the name of this function is incorrect. For converting -- coordinates relative to the widget to bin window coordinates, please see -- 'treeViewConvertWidgetToBinWindowCoords'. -- @@ -1302,7 +1302,7 @@ treeViewGetHoverExpand self = (toTreeView self) -- | Enables of disables the hover expansion mode of the tree view. Hover --- expansion makes rows expand or collaps if the pointer moves over them. +-- expansion makes rows expand or collapse if the pointer moves over them. -- -- * Available since Gtk+ version 2.6 -- @@ -1742,7 +1742,7 @@ treeViewHoverSelection = newAttrFromBoolProperty "hover-selection" -- %hash c:c694 d:3f15 -- | Enables of disables the hover expansion mode of @treeView@. Hover --- expansion makes rows expand or collaps if the pointer moves over them. +-- expansion makes rows expand or collapse if the pointer moves over them. -- -- This mode is primarily intended for 'TreeView's in popups, e.g. in -- 'ComboBox' or 'EntryCompletion'. @@ -1978,7 +1978,7 @@ afterStartInteractiveSearch = -- | Determine if this row should be collapsed. -- -- * If the application connects to this function and returns @False@, --- the specifc row will not be altered. +-- the specific row will not be altered. -- onTestCollapseRow, afterTestCollapseRow :: TreeViewClass self => self -> (TreeIter -> TreePath -> IO Bool) @@ -1991,7 +1991,7 @@ afterTestCollapseRow = connect_BOXED_BOXED__BOOL "test_collapse_row" -- | Determine if this row should be expanded. -- -- * If the application connects to this function and returns @False@, --- the specifc row will not be altered. +-- the specific row will not be altered. -- onTestExpandRow, afterTestExpandRow :: TreeViewClass self => self -> (TreeIter -> TreePath -> IO Bool) diff --git a/gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs b/gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs index f3401954d..9cefe0b18 100644 --- a/gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs +++ b/gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs @@ -258,7 +258,7 @@ treeViewColumnGetResizable self = {# call unsafe tree_view_column_get_resizable #} self --- | Set wether the column can be resized. +-- | Set whether the column can be resized. -- treeViewColumnSetSizing :: TreeViewColumn -> TreeViewColumnSizing diff --git a/gtk/Graphics/UI/Gtk/Multiline/TextIter.chs b/gtk/Graphics/UI/Gtk/Multiline/TextIter.chs index c55f21c9f..86545d219 100644 --- a/gtk/Graphics/UI/Gtk/Multiline/TextIter.chs +++ b/gtk/Graphics/UI/Gtk/Multiline/TextIter.chs @@ -200,7 +200,7 @@ textIterGetVisibleLineOffset ti = liftM fromIntegral $ -- If the element at this iterator is a non-character -- element, such as an image embedded in the buffer, the Unicode \"unknown\" -- character 0xFFFC is returned. If invoked on the end iterator, --- @Nothigng@ is returned. +-- @Nothing@ is returned. -- textIterGetChar :: TextIter -> IO (Maybe Char) textIterGetChar ti = do @@ -499,7 +499,7 @@ textIterIsStart ti = liftM toBool $ -- | Move 'TextIter' forwards. -- --- * Retuns True if the iterator is pointing to a character. +-- * Returns True if the iterator is pointing to a character. -- textIterForwardChar :: TextIter -> IO Bool textIterForwardChar ti = liftM toBool $ @@ -507,7 +507,7 @@ textIterForwardChar ti = liftM toBool $ -- | Move 'TextIter' backwards. -- --- * Retuns True if the movement was possible. +-- * Returns True if the movement was possible. -- textIterBackwardChar :: TextIter -> IO Bool textIterBackwardChar ti = liftM toBool $ @@ -516,7 +516,7 @@ textIterBackwardChar ti = liftM toBool $ -- | Move 'TextIter' forwards by -- @n@ characters. -- --- * Retuns @True@ if the iterator is pointing to a new character (and @False@ if +-- * Returns @True@ if the iterator is pointing to a new character (and @False@ if -- the iterator points to a picture or has not moved). -- -- * Note that images embedded @@ -530,7 +530,7 @@ textIterForwardChars ti n = liftM toBool $ -- | Move 'TextIter' backwards by -- @n@ characters. -- --- * Retuns @True@ if the iterator is pointing to a new character (and @False@ if +-- * Returns @True@ if the iterator is pointing to a new character (and @False@ if -- the iterator points to a picture or has not moved). -- textIterBackwardChars :: TextIter -> Int -> IO Bool @@ -540,7 +540,7 @@ textIterBackwardChars ti n = liftM toBool $ -- | Move 'TextIter' forwards. -- --- * Retuns True if the iterator is pointing to a new line (and False if the +-- * Returns True if the iterator is pointing to a new line (and False if the -- iterator points to a picture or has not moved). -- -- * If 'TextIter' is on the first line, it will be moved to the @@ -552,7 +552,7 @@ textIterForwardLine ti = liftM toBool $ -- | Move 'TextIter' backwards. -- --- * Retuns True if the iterator is pointing to a new line (and False if the +-- * Returns True if the iterator is pointing to a new line (and False if the -- iterator points to a picture or has not moved). -- -- * If 'TextIter' is on the first line, it will be moved to the end @@ -566,7 +566,7 @@ textIterBackwardLine ti = liftM toBool $ -- | Move 'TextIter' forwards by -- @n@ lines. -- --- * Retuns True if the iterator is pointing to a new line (and False if the +-- * Returns True if the iterator is pointing to a new line (and False if the -- iterator points to a picture or has not moved). -- -- * If 'TextIter' is on the first line, it will be moved to the @@ -581,7 +581,7 @@ textIterForwardLines ti n = liftM toBool $ -- | Move 'TextIter' backwards by -- @n@ lines. -- --- * Retuns True if the iterator is pointing to a new line (and False if the +-- * Returns True if the iterator is pointing to a new line (and False if the -- iterator points to a picture or has not moved). -- -- * If 'TextIter' is on the first line, it will be moved to the end @@ -596,7 +596,7 @@ textIterBackwardLines ti n = liftM toBool $ -- | Move 'TextIter' forwards by -- @n@ word ends. -- --- * Retuns True if the iterator is pointing to a new word end. +-- * Returns True if the iterator is pointing to a new word end. -- textIterForwardWordEnds :: TextIter -> Int -> IO Bool textIterForwardWordEnds ti n = liftM toBool $ @@ -605,7 +605,7 @@ textIterForwardWordEnds ti n = liftM toBool $ -- | Move 'TextIter' backwards by -- @n@ word beginnings. -- --- * Retuns True if the iterator is pointing to a new word start. +-- * Returns True if the iterator is pointing to a new word start. -- textIterBackwardWordStarts :: TextIter -> Int -> IO Bool textIterBackwardWordStarts ti n = liftM toBool $ @@ -614,7 +614,7 @@ textIterBackwardWordStarts ti n = liftM toBool $ -- | Move 'TextIter' forwards to the -- next word end. -- --- * Retuns True if the iterator has moved to a new word end. +-- * Returns True if the iterator has moved to a new word end. -- textIterForwardWordEnd :: TextIter -> IO Bool textIterForwardWordEnd ti = liftM toBool $ @@ -623,7 +623,7 @@ textIterForwardWordEnd ti = liftM toBool $ -- | Move 'TextIter' backwards to -- the next word beginning. -- --- * Retuns True if the iterator has moved to a new word beginning. +-- * Returns True if the iterator has moved to a new word beginning. -- textIterBackwardWordStart :: TextIter -> IO Bool textIterBackwardWordStart ti = liftM toBool $ @@ -633,7 +633,7 @@ textIterBackwardWordStart ti = liftM toBool $ -- the next cursor position. -- -- * Some characters are composed of two Unicode codes. This function ensures --- that 'TextIter' does not point inbetween such double characters. +-- that 'TextIter' does not point in between such double characters. -- -- * Returns True if 'TextIter' moved and points to a character (not -- to an object). @@ -646,7 +646,7 @@ textIterForwardCursorPosition ti = liftM toBool $ -- to the next cursor position. -- -- * Some characters are composed of two Unicode codes. This function ensures --- that 'TextIter' does not point inbetween such double characters. +-- that 'TextIter' does not point in between such double characters. -- -- * Returns True if 'TextIter' moved and points to a character (not -- to an object). @@ -679,7 +679,7 @@ textIterBackwardCursorPositions ti n = liftM toBool $ -- | Move 'TextIter' forwards by -- @n@ sentence ends. -- --- * Retuns True if the iterator is pointing to a new sentence end. +-- * Returns True if the iterator is pointing to a new sentence end. -- textIterForwardSentenceEnds :: TextIter -> Int -> IO Bool textIterForwardSentenceEnds ti n = liftM toBool $ @@ -688,7 +688,7 @@ textIterForwardSentenceEnds ti n = liftM toBool $ -- | Move 'TextIter' backwards -- by @n@ sentence beginnings. -- --- * Retuns True if the iterator is pointing to a new sentence start. +-- * Returns True if the iterator is pointing to a new sentence start. -- textIterBackwardSentenceStarts :: TextIter -> Int -> IO Bool textIterBackwardSentenceStarts ti n = liftM toBool $ @@ -697,7 +697,7 @@ textIterBackwardSentenceStarts ti n = liftM toBool $ -- | Move 'TextIter' forwards to -- the next sentence end. -- --- * Retuns True if the iterator has moved to a new sentence end. +-- * Returns True if the iterator has moved to a new sentence end. -- textIterForwardSentenceEnd :: TextIter -> IO Bool textIterForwardSentenceEnd ti = liftM toBool $ @@ -706,7 +706,7 @@ textIterForwardSentenceEnd ti = liftM toBool $ -- | Move 'TextIter' backwards -- to the next sentence beginning. -- --- * Retuns True if the iterator has moved to a new sentence beginning. +-- * Returns True if the iterator has moved to a new sentence beginning. -- textIterBackwardSentenceStart :: TextIter -> IO Bool textIterBackwardSentenceStart ti = liftM toBool $ @@ -942,7 +942,7 @@ textIterBackwardVisibleLines self count = -- | Calls 'textIterForwardVisibleWordEnd' up to count times. -- textIterForwardVisibleWordEnds :: TextIter - -> Int -- ^ @couter@ - number of times to move + -> Int -- ^ @counter@ - number of times to move -> IO Bool -- ^ return @True@ if iter moved and is not the end iterator textIterForwardVisibleWordEnds self count = liftM toBool $ @@ -953,7 +953,7 @@ textIterForwardVisibleWordEnds self count = -- | Calls 'textIterBackwardVisibleWordStart' up to count times. -- textIterBackwardVisibleWordStarts :: TextIter - -> Int -- ^ @couter@ - number of times to move + -> Int -- ^ @counter@ - number of times to move -> IO Bool -- ^ return @True@ if iter moved and is not the end iterator textIterBackwardVisibleWordStarts self count = liftM toBool $ @@ -1008,7 +1008,7 @@ textIterBackwardVisibleCursorPosition self = -- | Moves up to count visible cursor positions. -- See 'textIterForwardCursorPosition' for details. textIterForwardVisibleCursorPositions :: TextIter - -> Int -- ^ @couter@ - number of times to move + -> Int -- ^ @counter@ - number of times to move -> IO Bool -- ^ return @True@ if iter moved and is not the end iterator textIterForwardVisibleCursorPositions self count = liftM toBool $ @@ -1020,7 +1020,7 @@ textIterForwardVisibleCursorPositions self count = -- See 'textIterBackwardCursorPosition' for details. -- textIterBackwardVisibleCursorPositions :: TextIter - -> Int -- ^ @couter@ - number of times to move + -> Int -- ^ @counter@ - number of times to move -> IO Bool -- ^ return @True@ if iter moved and is not the end iterator textIterBackwardVisibleCursorPositions self count = liftM toBool $ diff --git a/gtk/Graphics/UI/Gtk/Multiline/TextMark.chs b/gtk/Graphics/UI/Gtk/Multiline/TextMark.chs index e4570fddd..39252c54a 100644 --- a/gtk/Graphics/UI/Gtk/Multiline/TextMark.chs +++ b/gtk/Graphics/UI/Gtk/Multiline/TextMark.chs @@ -189,7 +189,7 @@ textMarkGetLeftGravity self = -------------------- -- Attributes --- | Retreives the name of a mark. +-- | Retrieves the name of a mark. -- textMarkName :: TextMarkClass self => ReadAttr self (Maybe MarkName) textMarkName = readAttrFromMaybeStringProperty "name" diff --git a/gtk/Graphics/UI/Gtk/Multiline/TextTag.chs b/gtk/Graphics/UI/Gtk/Multiline/TextTag.chs index 8791c64cb..c704d2f5f 100644 --- a/gtk/Graphics/UI/Gtk/Multiline/TextTag.chs +++ b/gtk/Graphics/UI/Gtk/Multiline/TextTag.chs @@ -253,7 +253,7 @@ textAttributesCopyValues src dest = {# call text_attributes_copy_values #} src dest -- | This function is use internal for transform TextAttributes. --- Don't expoert this function. +-- Don't export this function. makeNewTextAttributes :: Ptr TextAttributes -> IO TextAttributes makeNewTextAttributes ptr = liftM TextAttributes $ newForeignPtr ptr text_attributes_unref diff --git a/gtk/Graphics/UI/Gtk/Multiline/TextView.chs b/gtk/Graphics/UI/Gtk/Multiline/TextView.chs index 6ae8cd20a..da00b5b20 100644 --- a/gtk/Graphics/UI/Gtk/Multiline/TextView.chs +++ b/gtk/Graphics/UI/Gtk/Multiline/TextView.chs @@ -21,13 +21,13 @@ -- TODO -- -- If PangoTabArray is bound: --- Fucntions: textViewSetTabs and textViewGetTabs +-- Functions: textViewSetTabs and textViewGetTabs -- Properties: textViewTabs -- --- All on... and after... signales had incorrect names (underscore instead of hypens). Thus +-- All on... and after... signals had incorrect names (underscore instead of hyphens). Thus -- they could not have been used in applications and removing them can't break anything. --- Thus, I've removed them. Also, all key-binding singals are now removed as there is --- no way to add additional key bindings programatically in a type-safe way, let alone +-- Thus, I've removed them. Also, all key-binding signals are now removed as there is +-- no way to add additional key bindings programmatically in a type-safe way, let alone -- use these signals. -- -- | @@ -717,7 +717,7 @@ textViewAddChildInWindow self child whichWindow xpos ypos = (fromIntegral xpos) (fromIntegral ypos) --- | Move a child widget within the 'TextView'. This is really only apprpriate +-- | Move a child widget within the 'TextView'. This is really only appropriate -- for \"floating\" child widgets added using 'textViewAddChildInWindow'. -- textViewMoveChild :: (TextViewClass self, WidgetClass child) => self diff --git a/gtk/Graphics/UI/Gtk/Multiline/Types.chs b/gtk/Graphics/UI/Gtk/Multiline/Types.chs index e968f621c..6d51063ae 100644 --- a/gtk/Graphics/UI/Gtk/Multiline/Types.chs +++ b/gtk/Graphics/UI/Gtk/Multiline/Types.chs @@ -50,7 +50,7 @@ textIterCopy (TextIter iter) = do copyBytes iterPtr' iterPtr textIterSize return (TextIter iter') --- | Interal marshaling util +-- | Internal marshaling util -- mkTextIterCopy :: Ptr TextIter -> IO TextIter mkTextIterCopy iterPtr = do diff --git a/gtk/Graphics/UI/Gtk/Ornaments/Frame.chs b/gtk/Graphics/UI/Gtk/Ornaments/Frame.chs index 555ae6f7b..19ce83a21 100644 --- a/gtk/Graphics/UI/Gtk/Ornaments/Frame.chs +++ b/gtk/Graphics/UI/Gtk/Ornaments/Frame.chs @@ -187,7 +187,7 @@ frameGetShadowType self = -- frameGetLabel :: (FrameClass self, GlibString string) => self -> IO string -- ^ returns the text in the label, or if there was no label - -- widget or the lable widget was not a 'Label' then an + -- widget or the label widget was not a 'Label' then an -- exception is thrown frameGetLabel self = throwIfNull "frameGetLabel: the title of the frame was not a Label widget." diff --git a/gtk/Graphics/UI/Gtk/Printing/PrintOperation.chs b/gtk/Graphics/UI/Gtk/Printing/PrintOperation.chs index 81423b9f8..cac0d175d 100644 --- a/gtk/Graphics/UI/Gtk/Printing/PrintOperation.chs +++ b/gtk/Graphics/UI/Gtk/Printing/PrintOperation.chs @@ -249,7 +249,7 @@ printOperationSetJobName self jobName = -- | Sets the number of pages in the document. -- -- This /must/ be set to a positive number before the rendering starts. It --- may be set in a 'beginPrint' signal hander. +-- may be set in a 'beginPrint' signal handler. -- -- Note that the page numbers passed to the 'requestPageSetup' -- and 'drawPage' signals @@ -327,7 +327,7 @@ printOperationSetUnit self unit = ((fromIntegral . fromEnum) unit) -- | Sets up the 'PrintOperation' to generate a file instead of showing the --- print dialog. The indended use of this function is for implementing \"Export +-- print dialog. The intended use of this function is for implementing \"Export -- to PDF\" actions. Currently, PDF is the only supported format. -- -- \"Print to PDF\" support is independent of this and is done by letting @@ -615,7 +615,7 @@ printOperationJobName = newAttrFromStringProperty "job-name" -- | The number of pages in the document. -- -- This must be set to a positive number before the rendering starts. It may be set in a 'beginPrint' --- signal hander. +-- signal handler. -- -- Note that the page numbers passed to the 'requestPageSetup' and 'drawPage' signals are 0-based, -- i.e. if the user chooses to print all pages, the last 'drawPage' signal will be for page @nPages@ - diff --git a/gtk/Graphics/UI/Gtk/Recent/RecentChooser.chs b/gtk/Graphics/UI/Gtk/Recent/RecentChooser.chs index 15bbf1ae4..8977184df 100644 --- a/gtk/Graphics/UI/Gtk/Recent/RecentChooser.chs +++ b/gtk/Graphics/UI/Gtk/Recent/RecentChooser.chs @@ -111,7 +111,7 @@ import Graphics.UI.Gtk.Abstract.Object (makeNewObject) -- | These identify the various errors that can occur while calling 'RecentChooser' functions. {#enum RecentChooserError {underscoreToCase} deriving (Bounded,Eq,Show)#} --- | Used to specify the sorting method to be applyed to the recently used resource list. +-- | Used to specify the sorting method to be applied to the recently used resource list. {#enum RecentSortType {underscoreToCase} deriving (Bounded,Eq,Show)#} -------------------- @@ -421,7 +421,7 @@ recentChooserFilter = newAttrFromObjectProperty "filter" -- | This signal is emitted when there is a change in the set of selected -- recently used resources. This can happen when a user modifies the selection --- with the mouse or the keyboard, or when explicitely calling functions to +-- with the mouse or the keyboard, or when explicitly calling functions to -- change the selection. -- -- diff --git a/gtk/Graphics/UI/Gtk/Recent/RecentManager.chs b/gtk/Graphics/UI/Gtk/Recent/RecentManager.chs index 459b18c83..4273b5c33 100644 --- a/gtk/Graphics/UI/Gtk/Recent/RecentManager.chs +++ b/gtk/Graphics/UI/Gtk/Recent/RecentManager.chs @@ -44,7 +44,7 @@ module Graphics.UI.Gtk.Recent.RecentManager ( -- -- The 'RecentManager' acts like a database of all the recently used files. -- You can create new 'RecentManager' objects, but it is more efficient to use --- the standard recent manager for the 'Screen' so that informations about the +-- the standard recent manager for the 'Screen' so that information about the -- recently used files is shared with other people using them. In case the -- default screen is being used, adding a new recently used file is as simple -- as: @@ -178,7 +178,7 @@ recentManagerRemoveItem self uri = (\_ -> return False) -- | Searches for a URI inside the recently used resources list, and returns a --- structure containing informations about the resource like its MIME type, or +-- structure containing information about the resource like its MIME type, or -- its display name. -- -- diff --git a/gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs b/gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs index e84bbf4f7..008186aae 100644 --- a/gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs +++ b/gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs @@ -189,7 +189,7 @@ scrolledWindowGetVAdjustment self = -- 'PolicyType' enumeration. If 'PolicyAlways', the scrollbar is always -- present; if 'PolicyNever', the scrollbar is never present; if -- 'PolicyAutomatic', the scrollbar is present only if needed (that is, if the --- slider part of the bar would be smaller than the trough - the display is +-- slider part of the bar would be smaller than the through - the display is -- larger than the page size). -- scrolledWindowSetPolicy :: ScrolledWindowClass self => self diff --git a/gtk/Graphics/UI/Gtk/Selectors/ColorSelection.chs b/gtk/Graphics/UI/Gtk/Selectors/ColorSelection.chs index 667718fb1..8187debb8 100644 --- a/gtk/Graphics/UI/Gtk/Selectors/ColorSelection.chs +++ b/gtk/Graphics/UI/Gtk/Selectors/ColorSelection.chs @@ -146,7 +146,7 @@ colorSelectionSetCurrentColor self color = -- colorSelectionGetHasOpacityControl :: ColorSelectionClass self => self -> IO Bool -- ^ returns @True@ if the color selector has an opacity control. - -- @False@ if it does't. + -- @False@ if it doesn't. colorSelectionGetHasOpacityControl self = liftM toBool $ {# call unsafe color_selection_get_has_opacity_control #} diff --git a/gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs b/gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs index e4dc77254..e9505ad62 100644 --- a/gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs +++ b/gtk/Graphics/UI/Gtk/Selectors/FileChooser.chs @@ -40,7 +40,7 @@ module Graphics.UI.Gtk.Selectors.FileChooser ( -- -- 'FileChooser' allows for shortcuts to various places in the filesystem. -- In the default implementation these are displayed in the left pane. It may --- be a bit confusing at first taht these shortcuts come from various sources +-- be a bit confusing at first that these shortcuts come from various sources -- and in various flavours, so lets explain the terminology here: -- ** File Names and Encodings diff --git a/gtk/Graphics/UI/Gtk/Windows/Assistant.chs b/gtk/Graphics/UI/Gtk/Windows/Assistant.chs index 7ebc3b0ee..7efa96c60 100644 --- a/gtk/Graphics/UI/Gtk/Windows/Assistant.chs +++ b/gtk/Graphics/UI/Gtk/Windows/Assistant.chs @@ -32,7 +32,7 @@ module Graphics.UI.Gtk.Windows.Assistant ( -- * Detail -- -- | A 'Assistant' is a widget used to represent a generally complex operation --- splitted in several steps, guiding the user through its pages and +-- split in several steps, guiding the user through its pages and -- controlling the page flow to collect the necessary data. -- ** GtkAssistant as GtkBuildable diff --git a/gtk/Graphics/UI/Gtk/Windows/Window.chs b/gtk/Graphics/UI/Gtk/Windows/Window.chs index ed2100f9a..560d250d3 100644 --- a/gtk/Graphics/UI/Gtk/Windows/Window.chs +++ b/gtk/Graphics/UI/Gtk/Windows/Window.chs @@ -1879,7 +1879,7 @@ windowGetUrgencyHint self = -- windowSetGeometryHints :: (WindowClass self, WidgetClass widget) => self -- ^ @window@ - the top level window - -> Maybe widget -- ^ @geometryWidget@ - optionall a widget the geometry + -> Maybe widget -- ^ @geometryWidget@ - optional a widget the geometry -- hints will be applied to rather than directly to the -- top level window -> Maybe (Int, Int) -- ^ @(minWidth, minHeight)@ - minimum width and height @@ -2011,7 +2011,7 @@ windowType :: WindowClass self => ReadAttr self WindowType windowType = readAttrFromEnumProperty "type" {# call pure unsafe gtk_window_type_get_type #} --- | If @True@, the window has no mimimum size. Setting this to @True@ is 99% +-- | If @True@, the window has no minimum size. Setting this to @True@ is 99% -- of the time a bad idea. -- -- Default value: @False@ @@ -2312,7 +2312,7 @@ windowGravity = newAttr -- | Whether the input focus is within this GtkWindow. -- -- Note: If add `window` before `HasToplevelFocus` (has-toplevel-focus attribute) --- will conflicts with fucntion `windowHasToplevelFocus`, so we named this attribute +-- will conflicts with function `windowHasToplevelFocus`, so we named this attribute -- to `windowToplevelFocus`. -- -- Default values: @False@ diff --git a/gtk/demo/buttonbox/ButtonBox.hs b/gtk/demo/buttonbox/ButtonBox.hs index fc4f629b1..b7cf530e1 100644 --- a/gtk/demo/buttonbox/ButtonBox.hs +++ b/gtk/demo/buttonbox/ButtonBox.hs @@ -28,8 +28,8 @@ main = do | button <- [button1, button2, button3] ] -- This sets button3 to be a so called 'secondary child'. When the layout - -- stlye is ButtonboxStart or ButtonboxEnd, the secondary children are - -- grouped seperately from the others. Resize the window to see the effect. + -- style is ButtonboxStart or ButtonboxEnd, the secondary children are + -- grouped separately from the others. Resize the window to see the effect. -- -- This is not interesting in itself but shows how to set child attributes. -- Note that the child attribute 'buttonBoxChildSecondary' takes the diff --git a/gtk/demo/carsim/CarSim.hs b/gtk/demo/carsim/CarSim.hs index c325d13d3..cbce74dbf 100644 --- a/gtk/demo/carsim/CarSim.hs +++ b/gtk/demo/carsim/CarSim.hs @@ -136,7 +136,7 @@ main = do -- If 'resume' is called, 'step' will be called at small -- timesteps to update car data. If 'pause' is called, 'step' - -- calls are stoped. 'resume' is called at program startup, + -- calls are stopped. 'resume' is called at program startup, -- and then the pause button alternates 'resume' and 'pause'. let step = do diff --git a/gtk/demo/concurrent/ProgressThreadedRTS.hs b/gtk/demo/concurrent/ProgressThreadedRTS.hs index 54f4f98ed..3bf084c6d 100644 --- a/gtk/demo/concurrent/ProgressThreadedRTS.hs +++ b/gtk/demo/concurrent/ProgressThreadedRTS.hs @@ -17,7 +17,7 @@ import Control.Concurrent main :: IO () main = do - -- It is marked unsafe becuase it is your obligation to ensure you + -- It is marked unsafe because it is your obligation to ensure you -- only call Gtk+ from one OS thread, or 'bad things' will happen. unsafeInitGUIForThreadedRTS diff --git a/gtk/demo/gtkbuilder/GtkBuilderTest.hs b/gtk/demo/gtkbuilder/GtkBuilderTest.hs index c9601204d..3056e45fe 100644 --- a/gtk/demo/gtkbuilder/GtkBuilderTest.hs +++ b/gtk/demo/gtkbuilder/GtkBuilderTest.hs @@ -13,7 +13,7 @@ main = do window <- builderGetObject builder castToWindow "window1" button <- builderGetObject builder castToButton "button1" - -- Basic user interation + -- Basic user interaction on button buttonActivated $ putStrLn "button pressed!" on window objectDestroy mainQuit diff --git a/gtk/demo/overlay/Overlay.hs b/gtk/demo/overlay/Overlay.hs index fe6424cc0..4385e7a34 100644 --- a/gtk/demo/overlay/Overlay.hs +++ b/gtk/demo/overlay/Overlay.hs @@ -20,7 +20,7 @@ main = do set window [ containerChild := overlay ] vbox <- vBoxNew True 3 - label1 <- labelNew (Just "This is an overlayed label") + label1 <- labelNew (Just "This is an overlaid label") button <- buttonNewWithLabel ("another one") label3 <- labelNew (Just "and a final one") boxPackStart vbox label1 PackNatural 3 @@ -44,8 +44,8 @@ main = do | button <- [button1, button2, button3] ] -- This sets button3 to be a so called 'secondary child'. When the layout - -- stlye is ButtonboxStart or ButtonboxEnd, the secondary children are - -- grouped seperately from the others. Resize the window to see the effect. + -- style is ButtonboxStart or ButtonboxEnd, the secondary children are + -- grouped separately from the others. Resize the window to see the effect. -- -- This is not interesting in itself but shows how to set child attributes. -- Note that the child attribute 'buttonBoxChildSecondary' takes the diff --git a/gtk/gtk.cabal-renamed b/gtk/gtk.cabal-renamed index 0ae9922a1..b75afd069 100644 --- a/gtk/gtk.cabal-renamed +++ b/gtk/gtk.cabal-renamed @@ -128,7 +128,7 @@ Flag have-quartz-gtk Flag fmode-binary Description: Set the default file translation mode for file I/O operations to _O_BINARY. - Some GTK libraries open image files without specifing binary mode. + Some GTK libraries open image files without specifying binary mode. If you have trouble loading gtk in ghci, then it may help to turn this option off. Default: True diff --git a/gtk/gtk3.cabal b/gtk/gtk3.cabal index ce9209a8e..acdce3de2 100644 --- a/gtk/gtk3.cabal +++ b/gtk/gtk3.cabal @@ -123,7 +123,7 @@ Flag build-demos Flag fmode-binary Description: Set the default file translation mode for file I/O operations to _O_BINARY. - Some GTK libraries open image files without specifing binary mode. + Some GTK libraries open image files without specifying binary mode. If you have trouble loading gtk in ghci, then it may help to turn this option off. Default: True diff --git a/gtk/hierarchy.list b/gtk/hierarchy.list index fb47de5ff..fe4b33d2d 100644 --- a/gtk/hierarchy.list +++ b/gtk/hierarchy.list @@ -10,7 +10,7 @@ # function is not specified, the is converted to # gtk__get_type where is where each upperscore # letter is converted to an underscore and lowerletter. The underscore -# is omitted if an upperscore letter preceeded: GtkHButtonBox -> +# is omitted if an upperscore letter preceded: GtkHButtonBox -> # gtk_hbutton_box_get_type. The generation of a type can be # conditional by appending 'if '. Such types are only produces if # --tag= is given on the command line of TypeGenerator. @@ -245,7 +245,7 @@ GtkSourceLanguageManager if gtksourceview2 GladeXML as GladeXML, glade_xml_get_type if libglade GConfClient as GConf if gconf -# These ones are actualy interfaces, but interface implementations are GObjects +# These ones are actually interfaces, but interface implementations are GObjects GtkCellEditable GtkEditable GtkSourceStyle as SourceStyleObject if gtksourceview2 diff --git a/gtk/hierarchy3.list b/gtk/hierarchy3.list index b1d102b25..a4f856988 100644 --- a/gtk/hierarchy3.list +++ b/gtk/hierarchy3.list @@ -10,7 +10,7 @@ # function is not specified, the is converted to # gtk__get_type where is where each upperscore # letter is converted to an underscore and lowerletter. The underscore -# is omitted if an upperscore letter preceeded: GtkHButtonBox -> +# is omitted if an upperscore letter preceded: GtkHButtonBox -> # gtk_hbutton_box_get_type. The generation of a type can be # conditional by appending 'if '. Such types are only produces if # --tag= is given on the command line of TypeGenerator. @@ -228,7 +228,7 @@ GtkSourceLanguageManager if gtksourceview2 GladeXML as GladeXML, glade_xml_get_type if libglade GConfClient as GConf if gconf -# These ones are actualy interfaces, but interface implementations are GObjects +# These ones are actually interfaces, but interface implementations are GObjects GtkCellEditable GtkEditable GtkSourceStyle as SourceStyleObject if gtksourceview2 diff --git a/gtk/hsgtk.h b/gtk/hsgtk.h index 0288ef5db..051a69582 100644 --- a/gtk/hsgtk.h +++ b/gtk/hsgtk.h @@ -1,5 +1,5 @@ #include -/* these are necessary on Win32 to circumvent the strcuture size check */ +/* these are necessary on Win32 to circumvent the structure size check */ #undef gtk_init_check #undef gtk_init diff --git a/pango/Graphics/Rendering/Pango/BasicTypes.chs b/pango/Graphics/Rendering/Pango/BasicTypes.chs index 21db748a4..4b33fd283 100644 --- a/pango/Graphics/Rendering/Pango/BasicTypes.chs +++ b/pango/Graphics/Rendering/Pango/BasicTypes.chs @@ -5,7 +5,7 @@ -- -- Author : Axel Simon -- --- Created: 9 Feburary 2003 +-- Created: 9 February 2003 -- -- Copyright (C) 1999-2005 Axel Simon -- diff --git a/pango/Graphics/Rendering/Pango/Description.chs b/pango/Graphics/Rendering/Pango/Description.chs index a5f0be428..df6a43bd3 100644 --- a/pango/Graphics/Rendering/Pango/Description.chs +++ b/pango/Graphics/Rendering/Pango/Description.chs @@ -4,7 +4,7 @@ -- -- Author : Axel Simon -- --- Created: 8 Feburary 2003 +-- Created: 8 February 2003 -- -- Copyright (C) 1999-2005 Axel Simon -- @@ -202,7 +202,7 @@ fontDescriptionMerge :: FontDescription -> FontDescription -> Bool -> IO () fontDescriptionMerge fd1 fd2 replace = {#call unsafe merge#} fd1 fd2 (fromBool replace) --- | Determine if two descriptions are simliar. +-- | Determine if two descriptions are similar. -- -- * Returns 'True' if the two descriptions only differ in weight or style. -- @@ -213,7 +213,7 @@ fontDescriptionIsMatch fdA fdB = unsafePerformIO $ liftM toBool $ -- | Determine which of two descriptions matches a given description better. -- -- * Returns @True@ if the last description is a better match to the first --- arguement than the middle one. +-- argument than the middle one. -- -- * Approximate matching is done on weight and style. If the other -- attributes do not match, the function returns @False@. @@ -232,7 +232,7 @@ fontDescriptionBetterMatch fd fdA fdB = unsafePerformIO $ liftM toBool $ -- word describes one of style, variant, weight or stretch. @SIZE@ is -- a decimal number giving the size of the font in points. If any of -- these fields is absent, the resulting 'FontDescription' will have --- the corresponing fields unset. +-- the corresponding fields unset. -- fontDescriptionFromString :: GlibString string => string -> IO FontDescription fontDescriptionFromString descr = withUTFString descr $ \strPtr -> diff --git a/pango/Graphics/Rendering/Pango/GlyphStorage.chs b/pango/Graphics/Rendering/Pango/GlyphStorage.chs index a2274274e..2e86126af 100644 --- a/pango/Graphics/Rendering/Pango/GlyphStorage.chs +++ b/pango/Graphics/Rendering/Pango/GlyphStorage.chs @@ -133,7 +133,7 @@ glyphItemXToIndex (GlyphItem (PangoItem ps pir) gs) pos = -- determines if the returned array starts with the leftmost glyph -- (@False@) or with the rightmost glyph (@True@). If @Nothing@ is -- passed in, the direction is taken from the 'GlyphItem', i.e., --- the array starts with the leftmost glyph for left-to-rigth text +-- the array starts with the leftmost glyph for left-to-right text -- and with the rightmost glyph for right-to-left text. When multiple -- characters compose a single glyph, the width of this glyph is -- divided among the characters that compose this cluster. diff --git a/pango/Graphics/Rendering/Pango/Layout.chs b/pango/Graphics/Rendering/Pango/Layout.chs index d902b0e37..b9a84c0eb 100644 --- a/pango/Graphics/Rendering/Pango/Layout.chs +++ b/pango/Graphics/Rendering/Pango/Layout.chs @@ -4,7 +4,7 @@ -- -- Author : Axel Simon -- --- Created: 8 Feburary 2003 +-- Created: 8 February 2003 -- -- Copyright (C) 1999-2005 Axel Simon -- @@ -426,7 +426,7 @@ layoutGetSpacing :: PangoLayout -> IO Double layoutGetSpacing (PangoLayout _ pl) = liftM intToPu $ {#call unsafe layout_get_spacing#} pl --- | Set if text should be streched to fit width. +-- | Set if text should be stretched to fit width. -- -- * Sets whether or not each complete line should be stretched to -- fill the entire width of the layout. This stretching is typically @@ -510,7 +510,7 @@ layoutGetAlignment (PangoLayout _ pl) = liftM (toEnum.fromIntegral) $ -- type TabPosition = (Double, TabAlign) --- | Set a list of Tab positoins. +-- | Set a list of Tab positions. -- layoutSetTabs :: PangoLayout -> [TabPosition] -> IO () layoutSetTabs (PangoLayout _ pl) tabs = do @@ -632,7 +632,7 @@ twoRect f = -- directionality equal to the base direction of the layout are inserted. -- The weak cursor location is the location where characters of the -- directionality opposite to the base direction of the layout are --- inserted. The first element of the typle is the strong position, +-- inserted. The first element of the tuple is the strong position, -- the second the weak. -- layoutGetCursorPos :: PangoLayout -> Int -> @@ -653,7 +653,7 @@ data CursorPos -- | Move a cursor visually. -- -- * Compute a new cursor position from a previous cursor position. A value --- of @True@ for the direction will move it to the right, independant of +-- of @True@ for the direction will move it to the right, independent of -- the underlying direction. Hence the cursor position might jump if -- left-to-right text is mixed with right-to-left text. -- @@ -673,7 +673,7 @@ data CursorPos -- a cluster. The @trail@ value can contain a positive -- value if the current cursor position is at the end of the current line. -- In this case, @idx@ points past the last character of this line while --- @trail@ contains the number of characters that are reponsible for the +-- @trail@ contains the number of characters that are responsible for the -- line break such as newlines. The actual cursor position is always -- @idx+trail@ where the visual cursor should be shown. -- @@ -851,7 +851,7 @@ layoutIterGetBaseline (LayoutIter _ li) = -- -- * Each 'LayoutLine' contains a list of 'GlyphItem's. This function -- returns the 'GlyphItem' under the current iterator. If the iterator --- is positioned past the last charactor of the paragraph, the function +-- is positioned past the last character of the paragraph, the function -- returns @Nothing@. -- layoutIterGetItem :: LayoutIter -> IO (Maybe GlyphItem) diff --git a/pango/Graphics/Rendering/Pango/Rendering.chs b/pango/Graphics/Rendering/Pango/Rendering.chs index fdcccdbdc..16cfd4810 100644 --- a/pango/Graphics/Rendering/Pango/Rendering.chs +++ b/pango/Graphics/Rendering/Pango/Rendering.chs @@ -4,7 +4,7 @@ -- -- Author : Axel Simon -- --- Created: 8 Feburary 2003 +-- Created: 8 February 2003 -- -- Copyright (C) 1999-2005 Axel Simon -- diff --git a/pango/Graphics/Rendering/Pango/Structs.hsc b/pango/Graphics/Rendering/Pango/Structs.hsc index d30f78960..0fa1c531c 100644 --- a/pango/Graphics/Rendering/Pango/Structs.hsc +++ b/pango/Graphics/Rendering/Pango/Structs.hsc @@ -65,7 +65,7 @@ import System.Glib.GObject (makeNewGObject) import Graphics.Rendering.Pango.Types import Graphics.Rendering.Pango.BasicTypes --- A pango unit is an internal euclidian metric, that is, a measure for +-- A pango unit is an internal euclidean metric, that is, a measure for -- lengths and position. -- -- * Deprecated. Replaced by Double. diff --git a/pango/hierarchy.list b/pango/hierarchy.list index ebf09ba7c..d27d4cd36 100644 --- a/pango/hierarchy.list +++ b/pango/hierarchy.list @@ -10,7 +10,7 @@ # function is not specified, the is converted to # gtk__get_type where is where each upperscore # letter is converted to an underscore and lowerletter. The underscore -# is omitted if an upperscore letter preceeded: GtkHButtonBox -> +# is omitted if an upperscore letter preceded: GtkHButtonBox -> # gtk_hbutton_box_get_type. The generation of a type can be # conditional by appending 'if '. Such types are only produces if # --tag= is given on the command line of TypeGenerator. @@ -211,7 +211,7 @@ GtkSourceLanguageManager if gtksourceview2 GladeXML as GladeXML, glade_xml_get_type if libglade GConfClient as GConf if gconf -# These ones are actualy interfaces, but interface implementations are GObjects +# These ones are actually interfaces, but interface implementations are GObjects GtkEditable GtkSourceStyle as SourceStyleObject if gtksourceview2 GtkSourceStyleScheme if sourceview diff --git a/tools/apiGen/src/AddDocs.hs b/tools/apiGen/src/AddDocs.hs index 98371dd0a..42da5cc30 100644 --- a/tools/apiGen/src/AddDocs.hs +++ b/tools/apiGen/src/AddDocs.hs @@ -249,7 +249,7 @@ convertPara knownSymbols para = case para of Docs.DocParaDefItem term def -> ParaDefItem (convertSpans knownSymbols term) (convertSpans knownSymbols def) Docs.DocParaListItem spans -> ParaListItem (convertSpans knownSymbols spans) - where fixme = "FIXME: if the follwing is a C code example" + where fixme = "FIXME: if the following is a C code example" ++ ", port it to Haskell or remove it" trimBlankLines = reverse . dropWhile (all Char.isSpace) . reverse . dropWhile (all Char.isSpace) . lines diff --git a/tools/apiGen/src/ApiGen.hs b/tools/apiGen/src/ApiGen.hs index 62ce5ec4c..1792daada 100644 --- a/tools/apiGen/src/ApiGen.hs +++ b/tools/apiGen/src/ApiGen.hs @@ -115,7 +115,7 @@ main = do let document = Xml.xmlParse apiFile apicontent api = Api.extractAPI document - -- For example whe processing Gtk we'd like to know about the types + -- For example when processing Gtk we'd like to know about the types -- included from Gdk and Pango includeApi = [ Api.extractAPI (Xml.xmlParse apiFile' content') | (apiFile', content') <- zip includeApiFiles includeApiFilesContents] diff --git a/tools/apiGen/src/Docs.hs b/tools/apiGen/src/Docs.hs index f6b4a821b..f1652508f 100644 --- a/tools/apiGen/src/Docs.hs +++ b/tools/apiGen/src/Docs.hs @@ -89,7 +89,7 @@ data SignalDoc = SignalDoc { data DocPara = DocParaText [DocParaSpan] -- an ordinary word-wrapped paragraph - | DocParaProgram String -- a verbatum section + | DocParaProgram String -- a verbatim section | DocParaTitle String -- a title to a subsection eg an example | DocParaDefItem [DocParaSpan] [DocParaSpan] -- a definition list item | DocParaListItem [DocParaSpan] -- a itemisted list item diff --git a/tools/apiGen/src/HaddockDocs.hs b/tools/apiGen/src/HaddockDocs.hs index 978286b77..d7aef5483 100644 --- a/tools/apiGen/src/HaddockDocs.hs +++ b/tools/apiGen/src/HaddockDocs.hs @@ -22,7 +22,7 @@ data Section = Section Int String [Para] data Para = ParaText [Span] -- an ordinary word-wrapped paragraph | ParaCode [[Span]] -- a @...@ code block - | ParaVerbatm [String] -- a > bird-track verbatum code block + | ParaVerbatm [String] -- a > bird-track verbatim code block | ParaTitle String -- a title to a subsection eg an example | ParaDefItem [Span] [Span] -- a definition list item | ParaListItem [Span] -- a itemisted list item diff --git a/tools/apiGen/src/Marshal.hs b/tools/apiGen/src/Marshal.hs index b3d9ce55f..c73dfc4e7 100644 --- a/tools/apiGen/src/Marshal.hs +++ b/tools/apiGen/src/Marshal.hs @@ -68,7 +68,7 @@ genMarshalParameter :: KnownSymbols -> --a collection of types we know to be objects or enums String -> --function name (useful to lookup per-func fixup info) String -> --parameter name suggestion (will be unique) - String -> --C type decleration for the parameter we will marshal + String -> --C type declaration for the parameter we will marshal (Maybe String, --parameter class constraints (or none) ParameterKind, --parameter type (or UnusedParam if the arg is not exposed) Doc -> Doc) --marshaling code (\body -> ... body ...) @@ -294,7 +294,7 @@ genMarshalResult :: KnownSymbols -> --a collection of types we know to be objects or enums String -> --function name (useful to lookup per-func fixup info) Bool -> --is the function a constructor or ordinary method? - String -> --C type decleration for the return value we will marshal + String -> --C type declaration for the return value we will marshal (String, --Haskell return type Doc -> Doc) --marshaling code (\body -> ... body ...) genMarshalResult _ _ _ "gboolean" = ("Bool", \body -> text "liftM toBool $" $$ body) @@ -482,7 +482,7 @@ genCallOrdinary cname _unsafe@False = c2hsHook "call" (text cname) -- name was that of the systems native 'codepage' which was usually ascii but -- could be one of several obscure multi-byte encodings. For 2.6 they have -- changed to always use a UTF8 encoding. However to maintain binary backwards --- compatability they kept the old names and added new ones with a _utf8 suffix +-- compatibility they kept the old names and added new ones with a _utf8 suffix -- for the new interpretation. However the old names are only in the binary, -- they are not exposed through the C header files so all software building -- against glib/gtk 2.6 on windows must use the _utf8 versions. Hence we diff --git a/tools/apiGen/src/MarshalFixup.hs b/tools/apiGen/src/MarshalFixup.hs index 9e88dc311..4237edcc3 100644 --- a/tools/apiGen/src/MarshalFixup.hs +++ b/tools/apiGen/src/MarshalFixup.hs @@ -1,6 +1,6 @@ -- This module actually contains data. It is specific to the Gtk+ libs that -- we're playing with. If we really cared enough we could split this --- information out into seperate data files that get read in at runtime. +-- information out into separate data files that get read in at runtime. -- However for now it's easier just to edit the data here and recompile. module MarshalFixup where @@ -523,7 +523,7 @@ nukeParameterDocumentation = nukeParamDoc -- name was that of the systems native 'codepage' which was usually ascii but -- could be one of several obscure multi-byte encodings. For 2.6 they have -- changed to always use a UTF8 encoding. However to maintain binary backwards --- compatability they kept the old names and added new ones with a _utf8 suffix +-- compatibility they kept the old names and added new ones with a _utf8 suffix -- for the new interpretation. However the old names are only in the binary, -- they are not exposed through the C header files so all software building -- against glib/gtk 2.6 on windows must use the _utf8 versions. Hence we diff --git a/tools/apiGen/src/Module.hs b/tools/apiGen/src/Module.hs index ff3572e12..e969040c6 100644 --- a/tools/apiGen/src/Module.hs +++ b/tools/apiGen/src/Module.hs @@ -627,7 +627,7 @@ reorderDecls :: Module -> Module reorderDecls module_ = module_ { --FIXME: this wirdness about treating methods differently - -- is only for compatability, remove it. + -- is only for compatibility, remove it. module_decls = List.sortBy (comparing lexicographicCurDocApi) methods ++ List.sortBy (comparing decl_index_api) others } diff --git a/tools/apicoverage/Makefile b/tools/apicoverage/Makefile index 7a2c4a8fb..b0f024571 100644 --- a/tools/apicoverage/Makefile +++ b/tools/apicoverage/Makefile @@ -1,6 +1,6 @@ # system to help check gtk2hs's api coverage -# which vesion of gtk+ to compare against, eg 2.0.9, 2.2.4, 2.4.13 +# which version of gtk+ to compare against, eg 2.0.9, 2.2.4, 2.4.13 GTK_MAJOR_VERSION = 2 GTK_MINOR_VERSION = 6 GTK_MICRO_VERSION = 1 diff --git a/tools/apicoverage/README b/tools/apicoverage/README index 144c47f9d..a3b9719f6 100644 --- a/tools/apicoverage/README +++ b/tools/apicoverage/README @@ -1,6 +1,6 @@ The tools in this directory are to help investigate gtk2hs's coverage of the gtk API. You should modify the Makefile to set which version of gtk you'd like to -check aginst. Running 'make' will then download the tarball from the gtk website +check against. Running 'make' will then download the tarball from the gtk website and extract the gtk.def file which contains a complete list of the exported gtk functions. diff --git a/tools/apidiff/ghc-pkg-apidump.sh b/tools/apidiff/ghc-pkg-apidump.sh index 917b4fc35..a99125781 100644 --- a/tools/apidiff/ghc-pkg-apidump.sh +++ b/tools/apidiff/ghc-pkg-apidump.sh @@ -2,7 +2,7 @@ # tool for comparing the exported API of different version of the same GHC # library package. It reports type changes and removals but not additions as -# thoses are what is important from an API compatability point of view. +# those are what is important from an API compatibility point of view. # $ ./ghc-pkg-apidump.sh gtk-0.9.10 gtk-0.9.10.2 > apichanges diff --git a/tools/c2hs/base/TODO b/tools/c2hs/base/TODO index eb589e1ac..5aa756896 100644 --- a/tools/c2hs/base/TODO +++ b/tools/c2hs/base/TODO @@ -38,7 +38,7 @@ Middle Term: monad. - GHC's system => when attributes of an identifier are updated, the "new" identifiers have to substituted into all expression that contain - usage occurences. + usage occurrences. * Graph processing support: Does it need to be a new mechanism or can we realise it via Attrs (what kind of generic functions could we provide). One @@ -58,7 +58,7 @@ Middle Term: * Parsers (maybe similar problem with Lexers): If the grammar is not LL(1), we just get an `ambiguous grammar' error message at runtime without any hint, - which part of the grammer might be ambiguous. This is too hard to debug! + which part of the grammar might be ambiguous. This is too hard to debug! * In the language-specific `XXXAttrs.hs' modules, the routines for handling the different on the attribute tables have always the same structure; Only diff --git a/tools/c2hs/base/admin/Config.hs b/tools/c2hs/base/admin/Config.hs index 5dfbf6a9b..53d209a75 100644 --- a/tools/c2hs/base/admin/Config.hs +++ b/tools/c2hs/base/admin/Config.hs @@ -34,7 +34,7 @@ module Config (-- limits -- errorLimit, -- - -- debuging + -- debugging -- assertEnabled) where diff --git a/tools/c2hs/base/errors/Errors.hs b/tools/c2hs/base/errors/Errors.hs index 452cd64e3..6f75db6e1 100644 --- a/tools/c2hs/base/errors/Errors.hs +++ b/tools/c2hs/base/errors/Errors.hs @@ -19,7 +19,7 @@ -- --- DESCRIPTION --------------------------------------------------------------- -- --- This modules exports some auxilliary routines for error handling. +-- This modules exports some auxiliary routines for error handling. -- --- DOCU ---------------------------------------------------------------------- -- @@ -78,7 +78,7 @@ data Error = Error ErrorLvl Position [String] -- (EXPORTED ABSTRACTLY) -- note that the equality to on errors takes into account only the error level -- and position (not the error text) -- --- note that these comparisions are expensive (the positions contain the file +-- note that these comparisons are expensive (the positions contain the file -- names as strings) -- instance Eq Error where diff --git a/tools/c2hs/base/general/Binary.hs b/tools/c2hs/base/general/Binary.hs index bbb1c18eb..17ebc7caa 100644 --- a/tools/c2hs/base/general/Binary.hs +++ b/tools/c2hs/base/general/Binary.hs @@ -296,7 +296,7 @@ getByte :: BinHandle -> IO Word8 getByte = getWord8 -- ----------------------------------------------------------------------------- --- Primitve Word writes +-- Primitive Word writes instance Binary Word8 where put_ = putWord8 @@ -358,7 +358,7 @@ instance Binary Word64 where (fromIntegral w8)) -- ----------------------------------------------------------------------------- --- Primitve Int writes +-- Primitive Int writes instance Binary Int8 where put_ h w = put_ h (fromIntegral w :: Word8) @@ -668,7 +668,7 @@ putBinFileWithDict file_path the_thing = do dict_p_p <- tellBin bh put_ bh dict_p_p -- Placeholder for ptr to dictionary - -- Make some intial state + -- Make some initial state usr_state <- newWriteState -- Put the main thing, diff --git a/tools/c2hs/base/general/FileOps.hs b/tools/c2hs/base/general/FileOps.hs index 743e68dcb..fe9baecfc 100644 --- a/tools/c2hs/base/general/FileOps.hs +++ b/tools/c2hs/base/general/FileOps.hs @@ -69,7 +69,7 @@ file `fileFindIn` paths = -- |Create a temporary file with a unique name. -- -- * A unique sequence of at least six characters and digits is added --- inbetween the two given components (the latter of which must include the +-- in between the two given components (the latter of which must include the -- file suffix if any is needed) -- -- * Default permissions are used, which might not be optimal, but diff --git a/tools/c2hs/base/general/UNames.hs b/tools/c2hs/base/general/UNames.hs index 13db4d637..21132200f 100644 --- a/tools/c2hs/base/general/UNames.hs +++ b/tools/c2hs/base/general/UNames.hs @@ -19,7 +19,7 @@ -- --- DESCRIPTION --------------------------------------------------------------- -- --- Generates unqiue names according to a method of L. Augustsson, M. Rittri +-- Generates unique names according to a method of L. Augustsson, M. Rittri -- & D. Synek ``Functional pearl: On generating unique names'', Journal of -- Functional Programming 4(1), pp 117-123, 1994. -- @@ -33,7 +33,7 @@ -- * This module provides an ordering relation on names (e.g., for using -- `Maps'), but no assumption maybe made on the order in which names -- are generated from the name space. Furthermore, names are instances of --- `Ix' to allow to use them as indicies. +-- `Ix' to allow to use them as indices. -- -- * A supply should be used *at most* once to *either* split it or extract a -- stream of names. A supply used repeatedly will always generate the same @@ -77,7 +77,7 @@ instance Ix Name where index (Name from, Name to) (Name idx) = index (from, to) idx inRange (Name from, Name to) (Name idx) = inRange (from, to) idx --- we want to show the number only, to be useful for generating unqiue +-- we want to show the number only, to be useful for generating unique -- printable names -- instance Show Name where diff --git a/tools/c2hs/base/state/StateBase.hs b/tools/c2hs/base/state/StateBase.hs index c07d29fc4..6910955ff 100644 --- a/tools/c2hs/base/state/StateBase.hs +++ b/tools/c2hs/base/state/StateBase.hs @@ -133,7 +133,7 @@ yield a = CST $ return a (+>=) :: PreCST e s a -> (a -> PreCST e s b) -> PreCST e s b m +>= k = CST $ unpackCST m >>= (\a -> unpackCST (k a)) --- bind dropping the result of the first state transfomer +-- bind dropping the result of the first state transformer -- (+>) :: PreCST e s a -> PreCST e s b -> PreCST e s b k +> m = k +>= const m diff --git a/tools/c2hs/base/state/StateTrans.hs b/tools/c2hs/base/state/StateTrans.hs index 91d943550..2aa304c08 100644 --- a/tools/c2hs/base/state/StateTrans.hs +++ b/tools/c2hs/base/state/StateTrans.hs @@ -42,7 +42,7 @@ -- Duponcheel (Report YALEU/DCS/RR-1004) from 1993, Section 8. -- -- * The use of GHC's inplace-update goodies within monads of kind `STB' is --- possible, bacause `IO' is based on `ST' in the GHC. +-- possible, because `IO' is based on `ST' in the GHC. -- -- * In the following, we call the two kinds of state managed by the `STB' the -- base state (the omnipresent state of the compiler) and generic state. @@ -149,7 +149,7 @@ m +>= k = let in k' bs' gs' -- cont --- bind dropping the result of the first state transfomer +-- bind dropping the result of the first state transformer -- (+>) :: STB bs gs a -> STB bs gs b -> STB bs gs b k +> m = k +>= const m @@ -270,8 +270,8 @@ interleave m gs' = STB $ let -- -- - exceptions are meant to be caught in order to recover the currently -- executed operation; they turn into fatal errors if they are not caught; --- execeptions are tagged, which allows to deal with multiple kinds of --- execeptions at the same time and to handle them differently +-- exceptions are tagged, which allows to deal with multiple kinds of +-- exceptions at the same time and to handle them differently -- - user-defined fatal errors abort the currently executed operation, but -- they may be caught at the top-level in order to terminate gracefully or -- to invoke another operation; there is no special support for different diff --git a/tools/c2hs/base/syms/Attributes.hs b/tools/c2hs/base/syms/Attributes.hs index 72a620d53..01f4c4271 100644 --- a/tools/c2hs/base/syms/Attributes.hs +++ b/tools/c2hs/base/syms/Attributes.hs @@ -358,12 +358,12 @@ getStdAttrDft atab at dft = UndefStdAttr -> interr $ "Attributes.getStdAttrDft: Undefined in\n" ++ errLoc atab (posOf at) --- check if the attribue value is marked as "don't care" (EXPORTED) +-- check if the attribute value is marked as "don't care" (EXPORTED) -- isDontCareStdAttr :: AttrTable (StdAttr a) -> Attrs -> Bool isDontCareStdAttr atab at = isDontCare (getAttr atab at) --- check if the attribue value is still undefined (EXPORTED) +-- check if the attribute value is still undefined (EXPORTED) -- -- * we also regard "don't care" attributes as undefined -- diff --git a/tools/c2hs/base/syms/NameSpaces.hs b/tools/c2hs/base/syms/NameSpaces.hs index cc67d1160..ac24d5295 100644 --- a/tools/c2hs/base/syms/NameSpaces.hs +++ b/tools/c2hs/base/syms/NameSpaces.hs @@ -58,7 +58,7 @@ import Binary (Binary(..)) -- they are not very many and the definitions entered last are the most -- frequently accessed ones; the list structure naturally hides older -- definitions, i.e., definitions from outer ranges; adding new definitions --- is done in time proportinal to the current size of the range; removing a +-- is done in time proportional to the current size of the range; removing a -- range is done in constant time (and the definitions of a range can be -- returned as a result of leaving the range); lookup is proportional to the -- number of definitions in the local ranges and the logarithm of the number @@ -76,11 +76,11 @@ nameSpace = NameSpace Map.empty [] -- add global definition (EXPORTED) -- --- * returns the modfied name space +-- * returns the modified name space -- --- * if the identfier is already declared, the resulting name space contains +-- * if the identifier is already declared, the resulting name space contains -- the new binding and the second component of the result contains the --- definition declared previosuly (which is henceforth not contained in the +-- definition declared previously (which is henceforth not contained in the -- name space anymore) -- defGlobal :: NameSpace a -> Ident -> a -> (NameSpace a, Maybe a) @@ -101,13 +101,13 @@ leaveRange (NameSpace gs (ls:lss)) = (NameSpace gs lss, ls) -- add local definition (EXPORTED) -- --- * returns the modfied name space +-- * returns the modified name space -- -- * if there is no local range, the definition is entered globally -- --- * if the identfier is already declared, the resulting name space contains +-- * if the identifier is already declared, the resulting name space contains -- the new binding and the second component of the result contains the --- definition declared previosuly (which is henceforth not contained in the +-- definition declared previously (which is henceforth not contained in the -- name space anymore) -- defLocal :: NameSpace a -> Ident -> a -> (NameSpace a, Maybe a) diff --git a/tools/c2hs/base/syms/tests/Main.hs b/tools/c2hs/base/syms/tests/Main.hs index 0034a77be..5b1f2661b 100644 --- a/tools/c2hs/base/syms/tests/Main.hs +++ b/tools/c2hs/base/syms/tests/Main.hs @@ -44,7 +44,7 @@ main = run ("", "", "") () ( -- assertion) when any of them is executed -- getNameSupply +>= \supply -> - -- acces with uninit. attr.s + -- access with uninit. attr.s -- checkAttrTableErr1 (names supply) +> -- set already set attr. -- checkAttrTableErr2 (names supply) +> diff --git a/tools/c2hs/base/syntax/Lexers.hs b/tools/c2hs/base/syntax/Lexers.hs index df7d9eec9..9bf1ff692 100644 --- a/tools/c2hs/base/syntax/Lexers.hs +++ b/tools/c2hs/base/syntax/Lexers.hs @@ -104,7 +104,7 @@ -- Regarding the character ranges, there seem to be at least two -- possibilities. Doaitse explicitly uses ranges and avoids expanding -- them. The problem with this approach is that we may only have --- predicates such as `isAlphaNum' to determine whether a givne character +-- predicates such as `isAlphaNum' to determine whether a given character -- belongs to some character class. From this representation it is -- difficult to efficiently compute a range. The second approach, as -- proposed by Tom Pledger (on the Haskell list) @@ -126,7 +126,7 @@ -- many re = \l' -> let self = re1 self >||< l' in self -- -- since epsilon = id.'' This should actually be as good as the current --- definiton and it might be worthwhile to offer it as a variant. +-- definition and it might be worthwhile to offer it as a variant. -- module Lexers (Regexp, Lexer, Action, epsilon, char, (+>), lexaction, diff --git a/tools/c2hs/c/CAST.hs b/tools/c2hs/c/CAST.hs index 580b9e3a2..1034671b7 100644 --- a/tools/c2hs/c/CAST.hs +++ b/tools/c2hs/c/CAST.hs @@ -414,7 +414,7 @@ instance Eq CEnum where -- C declarator (K&R A8.5) and abstract declarator (K&R A8.8) (EXPORTED) -- --- * We have one type qualifer list `[CTypeQual]' for each indirection (ie, +-- * We have one type qualifier list `[CTypeQual]' for each indirection (ie, -- each occurrence of `*' in the concrete syntax). -- -- * We unfold K&R's direct-declarators nonterminal into declarators. Note diff --git a/tools/c2hs/c/CAttrs.hs b/tools/c2hs/c/CAttrs.hs index 52a2d6b13..2f7834406 100644 --- a/tools/c2hs/c/CAttrs.hs +++ b/tools/c2hs/c/CAttrs.hs @@ -34,7 +34,7 @@ -- * In addition to the name spaces, the attribute structure tree contains -- a ident-definition table, which for attribute handles of identifiers -- refers to the identifiers definition. These are only used in usage --- occurences, except for one exception: The tag identifiers in forward +-- occurrences, except for one exception: The tag identifiers in forward -- definitions of structures or enums get a reference to the corresponding -- full definition - see `CTrav' for full details. -- diff --git a/tools/c2hs/c/CNames.hs b/tools/c2hs/c/CNames.hs index 0842eafa3..3b2056284 100644 --- a/tools/c2hs/c/CNames.hs +++ b/tools/c2hs/c/CNames.hs @@ -66,7 +66,7 @@ nameAnalysis ac = do return ac' --- name analyis traversal +-- name analysis traversal -- ---------------------- -- traverse a complete header file @@ -180,7 +180,7 @@ naCExpr (CConst _ _) = nop naCExpr (CCompoundLit _ inits _) = mapM_ (naCInit . snd) inits --- auxilliary functions +-- auxiliary functions -- -------------------- -- raise an error and exception if the identifier is defined twice diff --git a/tools/c2hs/c/CParser.y b/tools/c2hs/c/CParser.y index 5ae0333a9..7e190202d 100644 --- a/tools/c2hs/c/CParser.y +++ b/tools/c2hs/c/CParser.y @@ -35,7 +35,7 @@ -- -- -- Since some of the grammar productions are quite difficult to read --- (especially those involved with the decleration syntax) we document them +-- (especially those involved with the declaration syntax) we document them -- with an extended syntax that allows a more consise representation: -- -- Ordinary rules @@ -84,7 +84,7 @@ -- --- TODO ---------------------------------------------------------------------- -- --- * GNUC __attribute__s should be enetered into the parse tree since they +-- * GNUC __attribute__s should be entered into the parse tree since they -- contain useful api/abi information. -- -- * Some other extensions are currently recognised by the parser but not @@ -907,7 +907,7 @@ struct_declaring_list case $4 of (d,s) -> CDecl declspecs ((d,Nothing,s) : dies) attr } - -- We're being far too liberal in the parsing here, we realyl want to just + -- We're being far too liberal in the parsing here, we really want to just -- allow unnamed struct and union fields but we're actually allowing any -- unnamed struct member. Making it allow only unnamed structs or unions in -- the parser is far too tricky, it makes things ambiguous. So we'll have to diff --git a/tools/c2hs/c/CParserMonad.hs b/tools/c2hs/c/CParserMonad.hs index d2967ee68..e6932957b 100644 --- a/tools/c2hs/c/CParserMonad.hs +++ b/tools/c2hs/c/CParserMonad.hs @@ -1,7 +1,7 @@ -- C -> Haskell Compiler: Lexer for C Header Files -- -- Author : Manuel M T Chakravarty, Duncan Coutts --- Created: 12 Febuary 2007 +-- Created: 12 February 2007 -- -- Copyright (c) [1999..2004] Manuel M T Chakravarty -- Copyright (c) 2005-2007 Duncan Coutts diff --git a/tools/c2hs/c/CPretty.hs b/tools/c2hs/c/CPretty.hs index 17adf2a23..6fcc1c5c9 100644 --- a/tools/c2hs/c/CPretty.hs +++ b/tools/c2hs/c/CPretty.hs @@ -129,7 +129,7 @@ instance Pretty CExpr where pretty _ = text "<>" --- auxilliary functions +-- auxiliary functions -- -------------------- ident :: Ident -> Doc diff --git a/tools/c2hs/c/CTrav.hs b/tools/c2hs/c/CTrav.hs index ef5ce71b8..1cf971c12 100644 --- a/tools/c2hs/c/CTrav.hs +++ b/tools/c2hs/c/CTrav.hs @@ -109,7 +109,7 @@ import CAttrs (AttrC, getCHeader, enterNewRangeC, enterNewObjRangeC, type CState s = (AttrC, s) type CT s a = CST (CState s) a --- read attributed struture tree +-- read attributed structure tree -- readAttrCCT :: (AttrC -> a) -> CT s a readAttrCCT reader = readCST $ \(ac, _) -> reader ac @@ -237,7 +237,7 @@ findObjShadow ide = readAttrCCT $ \ac -> lookupDefObjCShadow ac ide -- object association added; otherwise, if a definition of the same name was -- already present, it is returned (see DOCU section) -- --- * it is checked that the first occurence of an enumeration tag is +-- * it is checked that the first occurrence of an enumeration tag is -- accompanied by a full definition of the enumeration -- defTag :: Ident -> CTag -> CT s (Maybe CTag) @@ -256,16 +256,16 @@ defTag ide tag = return Nothing -- transparent for env where -- compute whether we have the case of a non-conflicting redefined tag - -- definition, and if so, return the full definition and the foreward + -- definition, and if so, return the full definition and the forward -- definition's tag identifier -- -- * the first argument contains the _previous_ definition -- - -- * in the case of a structure, a foreward definition after a full + -- * in the case of a structure, a forward definition after a full -- definition is allowed, so we have to handle this case; enumerations - -- don't allow foreward definitions + -- don't allow forward definitions -- - -- * there may also be multiple foreward definition; if we have two of + -- * there may also be multiple forward definition; if we have two of -- them here, one is arbitrarily selected to take the role of the full -- definition -- @@ -747,7 +747,7 @@ lookupStructUnion ide ind useShadows decl <- findAndChaseDecl ide ind useShadows structFromDecl (posOf ide) decl --- for the given identifier, check for the existance of both a type definition +-- for the given identifier, check for the existence of both a type definition -- or a struct, union, or enum definition (EXPORTED) -- -- * if a typedef and a tag exists, the typedef takes precedence @@ -915,4 +915,4 @@ enumForwardErr :: Position -> CT s a enumForwardErr pos = raiseErrorCTExc pos ["Forward definition of enumeration!", - "ANSI C does not permit foreward definitions of enumerations!"] + "ANSI C does not permit forward definitions of enumerations!"] diff --git a/tools/c2hs/chs/CHS.hs b/tools/c2hs/chs/CHS.hs index f5be0208c..4f4c0cc45 100644 --- a/tools/c2hs/chs/CHS.hs +++ b/tools/c2hs/chs/CHS.hs @@ -129,7 +129,7 @@ data CHSModule = CHSModule [CHSFrag] -- * `CHSHook' are binding hooks, which are being replaced by Haskell code by -- `GenBind.expandHooks' -- --- * `CHSCPP' and `CHSC' are fragements of C code that are being removed when +-- * `CHSCPP' and `CHSC' are fragments of C code that are being removed when -- generating the custom C header in `GenHeader.genHeader' -- -- * `CHSCond' are strutured conditionals that are being generated by @@ -393,7 +393,7 @@ dumpCHS fname mod pureHaskell = contents version kind | hasCPP mod = showCHSModule mod pureHaskell | otherwise = "-- GENERATED by " ++ version ++ " " ++ kind ++ "\n\ - \-- Edit the ORIGNAL .chs file instead!\n\n" + \-- Edit the ORIGINAL .chs file instead!\n\n" ++ showCHSModule mod pureHaskell -- to keep track of the current state of the line emission automaton @@ -817,10 +817,10 @@ parseImport pos toks = do return $ CHSHook (CHSImport qual modid fName pos) : frags -- Qualified module names do not get lexed as a single token so we need to --- reconstruct it from a sequence of identifer and dot tokens. +-- reconstruct it from a sequence of identifier and dot tokens. -- rebuildModuleId ide (CHSTokDot _ : CHSTokIdent _ ide' : toks) = - let catIdent ide ide' = onlyPosIdent (posOf ide) --FIXME: unpleasent hack + let catIdent ide ide' = onlyPosIdent (posOf ide) --FIXME: unpleasant hack (identToLexeme ide ++ '.' : identToLexeme ide') in rebuildModuleId (catIdent ide ide') toks rebuildModuleId ide toks = (ide, toks) diff --git a/tools/c2hs/chs/CHSLexer.hs b/tools/c2hs/chs/CHSLexer.hs index f5a799821..ee448c755 100644 --- a/tools/c2hs/chs/CHSLexer.hs +++ b/tools/c2hs/chs/CHSLexer.hs @@ -108,8 +108,8 @@ -- C->Haskell keywords. -- -- * In the binding-hook lexer, the lexeme `#}' transfers control back to the --- base lexer. An occurence of the lexeme `{#' inside the binding-hook --- lexer triggers an error. The symbol `{#' is not explcitly represented +-- base lexer. An occurrence of the lexeme `{#' inside the binding-hook +-- lexer triggers an error. The symbol `{#' is not explicitly represented -- in the resulting token stream. However, the occurrence of a token -- representing one of the reserved identifiers `call', `context', `enum', -- and `field' marks the start of a binding hook. Strictly speaking, `#}' @@ -119,7 +119,7 @@ -- representing `#}'. -- -- * The rule `ident' describes Haskell identifiers, but without --- distinguishing between variable and constructor identifers (ie, those +-- distinguishing between variable and constructor identifiers (ie, those -- starting with a lowercase and those starting with an uppercase letter). -- However, we use it also to scan C identifiers; although, strictly -- speaking, it is too general for them. In the case of C identifiers, diff --git a/tools/c2hs/config.guess b/tools/c2hs/config.guess index ed2e03b7f..d4853c438 100644 --- a/tools/c2hs/config.guess +++ b/tools/c2hs/config.guess @@ -129,7 +129,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward diff --git a/tools/c2hs/doc/base/base.tex b/tools/c2hs/doc/base/base.tex index 69ca8e151..073a74270 100644 --- a/tools/c2hs/doc/base/base.tex +++ b/tools/c2hs/doc/base/base.tex @@ -322,7 +322,7 @@ \subsection{Restriction} ($x\geq02$)---if a version 3.$x$ system is selected, the make process automatically avoids compiling this module. Due to a bug in GHC 4.02, the generated \code{.hi} file \code{build/ghc-4/base/syntax/Parsers.hs} must be -edited by hand and the first two occurences of \code{\{\}} (left brace +edited by hand and the first two occurrences of \code{\{\}} (left brace immediately followed by right brace) should be deleted; otherwise, the compilation of modules importing \code{Parsers.hs} will fail. This bug should be fixed from GHC 4.02 on. @@ -443,7 +443,7 @@ \section{Comments} % it is not very helpful to write ``the value passed to \texttt{format} is one greater than that of \texttt{column}''---this is clear from the code. Instead -something, like ``the width of the formated region is one character wider than +something, like ``the width of the formatted region is one character wider than that of the cursor's current column position, to avoid some boundary conditions'' provides important additional information. @@ -455,7 +455,7 @@ \subsection{Comments for Clusters of Definitions} documentation, but brief descriptions ease the orientation in a complex module. If it gets too complex, consider splitting it into sub-modules. -\subsection{Comments for Funtion Definitions} +\subsection{Comments for Function Definitions} Figure~\ref{fig:fun-comment} gives the template of a function definition and its comments. @@ -630,7 +630,7 @@ \subsubsection{Global Error Table} extracted from the state using \code{showErrors}. The operation \code{showErrors} pretty prints the accumulated error messages into a \code{String}, which is returned, and removes the errors from the global error -table. On occurence of a fatal error, a fatal error exception is raised and the +table. On occurrence of a fatal error, a fatal error exception is raised and the pretty printed accumulated errors are added to the message of the fatal error exception. @@ -640,13 +640,13 @@ \subsubsection{Global Error Table} \subsubsection{Extra State} The extra state can be instantiated by the client compiler. Its initial value -is passed to the \code{run} funcion. +is passed to the \code{run} function. \subsection{Use of the Generic State} \label{sec:generic-state} The generic state (parameter of \code{CST}) is useful when a data structure -has to be updated often or has to be plumped thorugh some computation for +has to be updated often or has to be plumped through some computation for other reasons. It does not necessarily mean that the data structure is really updated in-place, but it may. It is important for the readability of the code, its reuse, and maintainability to keep the state information, i.e., the @@ -658,7 +658,7 @@ \subsection{Use of the Generic State} \end{quote} % As an example consider implementation of a graph-traversal that needs marking. -The use of a mutable table of marks that is seperate from the data structure +The use of a mutable table of marks that is separate from the data structure representing the graph localizes the state better than storing a `marked' flag within each node. As a result the graph itself will still be a purely functional structure, only the short-lived table of marks will be impure and @@ -690,11 +690,11 @@ \section{Fatal Errors and Exceptions} \item Exceptions are meant to be caught in order to recover the currently executed operation (e.g., we may want to abort type checking a certain expression, but continue with type checking the next function definition). - Exceptions turn into fatal errors if they are not caught. Execeptions are + Exceptions turn into fatal errors if they are not caught. Exceptions are tagged, which allows to deal with multiple kinds of exceptions at the same time and to handle them differently. - Exceptions are raised using \code{thow} and handled using \code{catch}. + Exceptions are raised using \code{throw} and handled using \code{catch}. \item User-defined fatal errors abort the currently executed operation (e.g.,\ loading a program module), but they may be caught at the top-level in order @@ -1063,7 +1063,7 @@ \section{Identifiers} % We spare us the use of some array that has to be updated destructively. The main disadvantage is increased memory usage due to maintaining a complex -identifiers representation for {\em each identifier occurence} (including the +identifiers representation for {\em each identifier occurrence} (including the often equal, but not shared, lexemes). This technique speeds up the equality test between \emph{distinct} identifiers. @@ -1073,7 +1073,7 @@ \section{Attributes} \label{sec:attrs} Attributes are not directly stored in the structure tree nodes. Instead, each -node has a unqiue \emph{attribute identifier}. Each kind of attribute is stored +node has a unique \emph{attribute identifier}. Each kind of attribute is stored in a global attribute table that is accessed via the attribute identifiers. These tables may have different representations according to the needs of an attribute. The representation may even be changed, e.g.,\ by @@ -1087,7 +1087,7 @@ \section{Attributes} \item Copying the structure tree to change some attribute is avoided. \item Complete attributes can be newly used or discarded independent from the structure tree or anything else. This is not only positive for minimizing - changes in the struture tree, but also for maintaining the whole program + changes in the structure tree, but also for maintaining the whole program code. \end{itemize} @@ -1096,7 +1096,7 @@ \section{Attributes} The handling of the attribute identifiers and the attribute tables is defined in the module \code{Attributes}. The attribute data type \code{Attrs} also contains a variant that does not contain an attribute identifier, but only a -position. This is used, for example, for the defining occurences of +position. This is used, for example, for the defining occurrences of identifiers of builtin objects. \subsection{Making Attributes} @@ -1121,7 +1121,7 @@ \subsection{Identifier Attributes vs.\ AST Attributes} The main function of the identifiers attributes is to reference the object that the identifiers represents. Note that the identifiers of the -\emph{defining occurences} of builtin objects can not be associated with +\emph{defining occurrences} of builtin objects can not be associated with attributes in an attribute table. A position is the only attribute they can take. (Giving them full attributes would cause some hassle, because they then would need a unique name, and furthermore, these attributes would not be used @@ -1152,7 +1152,7 @@ \section{Primitive Definition Files} To keep the core of the compiler as small as possible \emph{primitive definition files (PDFs)} are used to specify the translation of the -primitives occuring in \KCode\ and \FOC. To ease the maintenance of the +primitives occurring in \KCode\ and \FOC. To ease the maintenance of the primitives, the PDFs have a restricted layout (although they are standard Haskell files). @@ -1215,7 +1215,7 @@ \section{Primitive Definition Files} compiler. \code{Primitives} exports a \code{FiniteMap} that maps the identifiers of the primitives to a pair of signature and primitive definition. -\chapter{Auxilliary Modules} +\chapter{Auxiliary Modules} \label{cha:aux} \section{Error Handling} @@ -1298,7 +1298,7 @@ \subsection{Errors in the Compiled Program} \item[Warning.] Suspicious constructs in a program generate a warning. This does not necessarily mean that the code is incorrect and it does not prevent the generation of code or the execution of the program. -\item[Plain Error.] Notation that is inavlid by the static semantics of the +\item[Plain Error.] Notation that is invalid by the static semantics of the programming language leads to a plain error. A single such error prevents code generation, but the remainder of the program can still be analyzed to find further errors. diff --git a/tools/c2hs/doc/c2hs/c2hs.sgml b/tools/c2hs/doc/c2hs/c2hs.sgml index 93e99bc1b..f463a0a29 100644 --- a/tools/c2hs/doc/c2hs/c2hs.sgml +++ b/tools/c2hs/doc/c2hs/c2hs.sgml @@ -425,7 +425,7 @@ Function hooks are call hooks including parameter marshalling. Thus, the components of a function hook up to and including the /, which denotes the type context. This is followed @@ -465,7 +465,7 @@ the order in which the marshalling specifications are given, with the exception that the value of the result marshaller is always the first component in the result tuple if it is included at all.

-For a set of commonly occuring Haskell and C type combinations, ]

-Class hooks facilitate the definition of a single inheritance class hierachy +Class hooks facilitate the definition of a single inheritance class hierarchy for external pointers including up and down cast functionality. This is meant to be used in cases where the objects referred to by the external pointers are -order in such a hierachy in the external API - such structures are encountered +order in such a hierarchy in the external API - such structures are encountered in C libraries that provide an object-oriented interface. Each class hook rewrites to a class declaration and one or more instance declarations.

@@ -687,7 +687,7 @@ external pointer is identified by -The pointers in a hierachy must either all be foreign pointers or all be +The pointers in a hierarchy must either all be foreign pointers or all be normal pointers. Stable pointers are not allowed. Both pointer defined as Solaris-related fix Marshalling support for bit masks represented as enumeration types Added In call hooks, the attributes `fun' was replaced by `pure' (`fun' is will still be recognised for a while to ensure backwards compatibility, but diff --git a/tools/c2hs/doc/c2hs/lib/CString.hs b/tools/c2hs/doc/c2hs/lib/CString.hs index 7a1271f9b..d1d1c95ea 100644 --- a/tools/c2hs/doc/c2hs/lib/CString.hs +++ b/tools/c2hs/doc/c2hs/lib/CString.hs @@ -115,7 +115,7 @@ withCString = withArray0 nUL . charsToCChars withCStringLen :: String -> (CStringLen -> IO a) -> IO a withCStringLen str act = withArray (charsToCChars str) $ act . pairLength str --- auxilliary definitions +-- auxiliary definitions -- ---------------------- -- C's end of string character diff --git a/tools/c2hs/doc/c2hs/lib/ForeignPtr.hs b/tools/c2hs/doc/c2hs/lib/ForeignPtr.hs index 58235bf3d..a7a1d5ac6 100644 --- a/tools/c2hs/doc/c2hs/lib/ForeignPtr.hs +++ b/tools/c2hs/doc/c2hs/lib/ForeignPtr.hs @@ -79,7 +79,7 @@ withForeignPtr (ForeignPtr fp) m = do -- Extract the vanilla pointer from a foreign pointer -- -- * This is a potentially dangerous operations, as if the argument to --- foreignPtrToPtr is the last usage occurence of the given foreign pointer, +-- foreignPtrToPtr is the last usage occurrence of the given foreign pointer, -- then its finaliser(s) will be run, which potentially invalidates the -- plain pointer just obtained. Hence, `touchForeignPtr' must be used -- wherever it has to be guaranteed that the pointer lives on - i.e., has diff --git a/tools/c2hs/doc/c2hs/lib/MarshalAlloc.hs b/tools/c2hs/doc/c2hs/lib/MarshalAlloc.hs index 3074175e6..d406802d0 100644 --- a/tools/c2hs/doc/c2hs/lib/MarshalAlloc.hs +++ b/tools/c2hs/doc/c2hs/lib/MarshalAlloc.hs @@ -70,7 +70,7 @@ free :: Ptr a -> IO () free = _free --- auxilliary routines +-- auxiliary routines -- ------------------- -- asserts that the pointer returned from the action in the second argument is diff --git a/tools/c2hs/doc/c2hs/lib/MarshalUtils.hs b/tools/c2hs/doc/c2hs/lib/MarshalUtils.hs index 7124bfe00..e74f76e3a 100644 --- a/tools/c2hs/doc/c2hs/lib/MarshalUtils.hs +++ b/tools/c2hs/doc/c2hs/lib/MarshalUtils.hs @@ -134,7 +134,7 @@ moveBytes :: Ptr a -> Ptr a -> Int -> IO () moveBytes dest src size = memmove dest src (fromIntegral size) --- auxilliary routines +-- auxiliary routines -- ------------------- -- basic C routines needed for memory copying diff --git a/tools/c2hs/gen/GBMonad.hs b/tools/c2hs/gen/GBMonad.hs index 5a60318a0..908896261 100644 --- a/tools/c2hs/gen/GBMonad.hs +++ b/tools/c2hs/gen/GBMonad.hs @@ -374,7 +374,7 @@ queryPointer hsName = do -- merge the pointer and Haskell object maps -- --- * currently, the read map overrides any entires for shared keys in the map +-- * currently, the read map overrides any entries for shared keys in the map -- that is already in the monad; this is so that, if multiple import hooks -- add entries for shared keys, the textually latest prevails; any local -- entries are entered after all import hooks anyway diff --git a/tools/c2hs/gen/GenBind.hs b/tools/c2hs/gen/GenBind.hs index 62a03a468..5f0e50f55 100644 --- a/tools/c2hs/gen/GenBind.hs +++ b/tools/c2hs/gen/GenBind.hs @@ -27,7 +27,7 @@ -- -- * If there is an error in one binding hook, it is skipped and the next one -- is processed (to collect as many errors as possible). However, if at --- least one error occured, the expansion of binding hooks ends in a fatal +-- least one error occurred, the expansion of binding hooks ends in a fatal -- exception. -- -- * `CST' exceptions are used to back off a binding hook as soon as an error @@ -432,7 +432,7 @@ expandHook hook@(CHSCall isPure isUns isNol ide oalias pos) = -- (ObjCO cdecl, ide) <- findFunObj ide True mLock <- if isNol then return Nothing else getLock - let ideLexeme = identToLexeme ide -- orignal name might have been a shadow + let ideLexeme = identToLexeme ide -- original name might have been a shadow hsLexeme = ideLexeme `maybe` identToLexeme $ oalias cdecl' = ide `simplifyDecl` cdecl callImport hook isPure isUns mLock ideLexeme hsLexeme cdecl' pos @@ -448,7 +448,7 @@ expandHook hook@(CHSFun isPure isUns isNol ide oalias ctxt parms parm pos) = -- (ObjCO cdecl, cide) <- findFunObj ide True mLock <- if isNol then return Nothing else getLock - let ideLexeme = identToLexeme ide -- orignal name might have been a shadow + let ideLexeme = identToLexeme ide -- original name might have been a shadow hsLexeme = ideLexeme `maybe` identToLexeme $ oalias fiLexeme = hsLexeme ++ "'_" -- *Urgh* - probably unique... fiIde = onlyPosIdent nopos fiLexeme @@ -928,7 +928,7 @@ addDftMarshaller pos parms parm cdecl = do noDftMarshErr pos "\"out\"" hsTy cTys return (marsh, case marsh of {Just (_, kind) -> kind == CHSIOArg}) -- - -- add void marshaller if no explict one is given + -- add void marshaller if no explicit one is given -- addDftVoid marsh@(Just (_, kind)) = return (marsh, kind == CHSIOArg) addDftVoid Nothing = do @@ -1001,7 +1001,7 @@ accessPath (CHSDeref path pos) = -- *a _ -> ptrExpectedErr pos --- replaces a decleration by its alias if any +-- replaces a declaration by its alias if any -- -- * the alias inherits any field size specification that the original -- declaration may have @@ -1223,7 +1223,7 @@ data ConstResult = IntResult Integer -- types that may occur in foreign declarations, ie, Haskell land types -- --- * we reprsent C functions with no arguments (ie, the ANSI C `void' +-- * we represent C functions with no arguments (ie, the ANSI C `void' -- argument) by `FunET UnitET res' rather than just `res' internally, -- although the latter representation is finally emitted into the binding -- file; this is because we need to know which types are functions (in @@ -1936,7 +1936,7 @@ applyUnary cpos CNegOp (FloatResult _) = illegalConstExprErr cpos "! applied to a float" --- auxilliary functions +-- auxiliary functions -- -------------------- -- create an identifier without position information diff --git a/tools/c2hs/mk/common.mk b/tools/c2hs/mk/common.mk index 0c6d6ef03..0719aae94 100644 --- a/tools/c2hs/mk/common.mk +++ b/tools/c2hs/mk/common.mk @@ -250,7 +250,7 @@ rectest: $(MAKE) -C $$part $(MFLAGS) test || exit; \ done -# auxilliary targets +# auxiliary targets # .PHONY: recclean reccleanhi cleanall spotless diff --git a/tools/c2hs/toplevel/Gtk2HsC2Hs.hs b/tools/c2hs/toplevel/Gtk2HsC2Hs.hs index 7b809f338..eaac653b9 100644 --- a/tools/c2hs/toplevel/Gtk2HsC2Hs.hs +++ b/tools/c2hs/toplevel/Gtk2HsC2Hs.hs @@ -42,7 +42,7 @@ -- Note: These also depend on suffixes defined in the compiler proper. -- -- .h C header file --- .i pre-processeed C header file +-- .i pre-processed C header file -- .hs Haskell file -- .chs Haskell file with C->Haskell hooks (binding file) -- .chi C->Haskell interface file @@ -54,13 +54,13 @@ -- --cppopts=CPPOPTS -- Pass the additional options CPPOPTS to the C preprocessor. -- --- Repeated occurences accumulate. +-- Repeated occurrences accumulate. -- -- -c CPP -- --cpp=CPP -- Use the executable CPP to invoke CPP. -- --- In the case of repeated occurences, the last takes effect. +-- In the case of repeated occurrences, the last takes effect. -- -- -d TYPE -- --dump=TYPE @@ -128,7 +128,7 @@ -- Wrap each foreign function call in the function NAME. This -- function is usually a function that acquires a lock for -- the memory region that the called function is about to access. --- A wrap function can also be specificed within the file in the +-- A wrap function can also be specified within the file in the -- context hook, in which case it overrides the command line function. -- The wrapper function can be omitted on a call-by-call basis by -- using the nolock option in the call hook. @@ -215,7 +215,7 @@ data Flag = CPPOpts String -- additional options for C preprocessor | PreComp String -- write or read a precompiled header | LockFun String -- wrap each function call in this function | Version -- print version information on stderr - | Error String -- error occured during processing of options + | Error String -- error occurred during processing of options deriving Eq data DumpType = Trace -- compiler trace diff --git a/tools/c2hs/toplevel/c2hs_config.c b/tools/c2hs/toplevel/c2hs_config.c index fd4f52c51..c1fa2f3a5 100644 --- a/tools/c2hs/toplevel/c2hs_config.c +++ b/tools/c2hs/toplevel/c2hs_config.c @@ -42,7 +42,7 @@ int bitfield_direction () { union bitfield_direction_union v; - /* if setting the second bit in a bitfield makes the storeage unit contain + /* if setting the second bit in a bitfield makes the storage unit contain * the value `2', the direction of bitfields must be increasing towards the * MSB */ diff --git a/tools/hierarchyGen/TypeGen.hs b/tools/hierarchyGen/TypeGen.hs index 685e1bae4..fb354fb55 100644 --- a/tools/hierarchyGen/TypeGen.hs +++ b/tools/hierarchyGen/TypeGen.hs @@ -10,7 +10,7 @@ import System.Exit (exitWith, ExitCode(..)) import System.IO (stderr, hPutStr) import Paths_gtk2hs_buildtools (getDataFileName) --- The current object and its inheritence relationship is defined by all +-- The current object and its inheritance relationship is defined by all -- ancestors and their column position. type ObjectSpec = [(Int,String)] diff --git a/tools/hierarchyGen/hierarchy.list b/tools/hierarchyGen/hierarchy.list index 59db33fe8..aed1d8680 100644 --- a/tools/hierarchyGen/hierarchy.list +++ b/tools/hierarchyGen/hierarchy.list @@ -10,7 +10,7 @@ # function is not specified, the is converted to # gtk__get_type where is where each upperscore # letter is converted to an underscore and lowerletter. The underscore -# is omitted if an upperscore letter preceeded: GtkHButtonBox -> +# is omitted if an upperscore letter preceded: GtkHButtonBox -> # gtk_hbutton_box_get_type. The generation of a type can be # conditional by appending 'if '. Such types are only produces if # --tag= is given on the command line of TypeGenerator. @@ -213,7 +213,7 @@ GtkSourceLanguageManager if gtksourceview2 GladeXML as GladeXML, glade_xml_get_type if libglade GConfClient as GConf if gconf -# These ones are actualy interfaces, but interface implementations are GObjects +# These ones are actually interfaces, but interface implementations are GObjects GtkEditable GtkSourceStyle as SourceStyleObject if gtksourceview2 GtkSourceStyleScheme if sourceview diff --git a/tools/src/Gtk2HsSetup.hs b/tools/src/Gtk2HsSetup.hs index 598048fc9..b7e0cb904 100644 --- a/tools/src/Gtk2HsSetup.hs +++ b/tools/src/Gtk2HsSetup.hs @@ -508,7 +508,7 @@ instance Ord ModDep where -- Extract the dependencies of this file. This is intentionally rather naive as it -- ignores CPP conditionals. We just require everything which means that the --- existance of a .chs module may not depend on some CPP condition. +-- existence of a .chs module may not depend on some CPP condition. extractDeps :: ModDep -> IO ModDep extractDeps md@ModDep { mdLocation = Nothing } = return md extractDeps md@ModDep { mdLocation = Just f } = withUTF8FileContents f $ \con -> do diff --git a/tools/win32/gtk2hs.iss b/tools/win32/gtk2hs.iss index 76fac39b6..a8f2973e9 100644 --- a/tools/win32/gtk2hs.iss +++ b/tools/win32/gtk2hs.iss @@ -124,10 +124,10 @@ begin if LoadStringFromFile(TmpFile, Result) then begin Result := Trim(Result); - Log('ExecOutput: running ' + Filename + ' succeded with output: ' + Result); + Log('ExecOutput: running ' + Filename + ' succeeded with output: ' + Result); end else - Log('ExecOutput: running ' + Filename + ' succeded, but the temp file was not created') + Log('ExecOutput: running ' + Filename + ' succeeded, but the temp file was not created') else Log('ExecOutput: running ' + Filename + ' failed, code: ' + IntToStr(ResultCode)) else @@ -421,7 +421,7 @@ begin 'You can fix this problem in a couple of ways:' #13#10 #13#10 '1) You could uninstall or delete the program that installed the offending files ' + '(eg it might be that you have an old version of Gtk+ installed).' #13#10 #13#10 - '2) You could modify the system-wide "Path" envrionment variable and remove the ' + '2) You could modify the system-wide "Path" environment variable and remove the ' + 'offending directory from it.' end else diff --git a/tools/win32/prune.sh b/tools/win32/prune.sh index 1dd40f20a..0e8942d97 100644 --- a/tools/win32/prune.sh +++ b/tools/win32/prune.sh @@ -13,7 +13,7 @@ rm -rvf */make/ */share/man/ */man/ */share/gtk-doc/ */share/doc/ */src # only needed for rebuilding gtk libs rm -rvf */share/aclocal/ -# don't need deverloper util progs +# don't need developer util progs rm -rvf *-dev-*/bin/ # don't need manifests