[Gtk2hs-commit] (main branch): Make compile with Gtk+ 2.10

[Axel S. <si...@co...>]

Thu Nov 12 17:38:02 EST 2009  Axel Simon <Axe...@en...>
  * Make compile with Gtk+ 2.10

    move ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp
    move ./gtk/Graphics/UI/Gtk/Windows/WindowGroup.chs ./gtk/Graphics/UI/Gtk/Windows/WindowGroup.chs.pp
    hunk ./Makefile.am 695
    -	gtk/Graphics/UI/Gtk/Multiline/TextMark.chs			\
    +	gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp			\
    hunk ./Makefile.am 763
    -	gtk/Graphics/UI/Gtk/Windows/WindowGroup.chs			\
    +	gtk/Graphics/UI/Gtk/Windows/WindowGroup.chs.pp			\
    hunk ./glib/System/Glib/Properties.chs 77
    -  writeAttrFromMaybeStringProperty,
    hunk ./glib/System/Glib/Properties.chs 78
    +  readAttrFromMaybeStringProperty,
    +  writeAttrFromMaybeStringProperty,
    hunk ./glib/System/Glib/Properties.chs 294
    -writeAttrFromMaybeStringProperty :: GObjectClass gobj => String -> WriteAttr gobj (Maybe String)
    -writeAttrFromMaybeStringProperty propName =
    -  writeAttr (objectSetPropertyMaybeString propName)
    -
    hunk ./glib/System/Glib/Properties.chs 298
    +readAttrFromMaybeStringProperty :: GObjectClass gobj => String -> ReadAttr gobj (Maybe String)
    +readAttrFromMaybeStringProperty propName =
    +  readAttr (objectGetPropertyMaybeString propName)
    +
    +writeAttrFromMaybeStringProperty :: GObjectClass gobj => String -> WriteAttr gobj (Maybe String)
    +writeAttrFromMaybeStringProperty propName =
    +  writeAttr (objectSetPropertyMaybeString propName)
    +
    hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs.pp 264
    +
    hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs.pp 65
    +#if GTK_CHECK_VERSION(2,12,0)
    hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs.pp 67
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs.pp 144
    -import Graphics.UI.Gtk.General.Enums ( DestDefaults(..), DragProtocol(..),
    -                                       DragResult(..) )
    +import Graphics.UI.Gtk.General.Enums ( DestDefaults(..), DragProtocol(..)
    +#if GTK_CHECK_VERSION(2,12,0)
    +
    +                                     , DragResult(..)
    +#endif
    +                                     )
    hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs.pp 38
    +#if GTK_CHECK_VERSION(2,12,0)
    hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs.pp 40
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs.pp 179
    +#if GTK_CHECK_VERSION(2,12,0)
    hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs.pp 181
    --- obtained by connecting to the 'Graphics.UI.Gtk.General.Drag.dragFailed'
    --- signal.
    +-- obtained by connecting to the 'dragFailed' signal.
    hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs.pp 197
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 93
    +#if GTK_CHECK_VERSION(2,12,0)
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 95
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 497
    --- | Adds the mark at position where. [_$_]
    --- The mark must not be added to another buffer, [_$_]
    --- and if its name is not empty then there must not be another mark in the buffer nwith the same name.
    +#if GTK_CHECK_VERSION(2,12,0)
    +-- | Adds the mark at position given by the 'TextIter'. [_$_]
    +-- The mark may not be added to any other buffer.
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 501
    --- Emits the "mark-set" signal as notification of the mark's initial placement.
    +-- Emits the 'markSet' signal as notification of the mark's initial placement.
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 509
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 511
    --- | Moves @mark@ to the new location @where@. Emits the \"mark_set\" signal
    +-- | Moves @mark@ to the new location @where@. Emits the 'markSet' signal
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 1069
    -textBufferTagTable :: (TextBufferClass self, TextTagTableClass textTagTable) => ReadWriteAttr self TextTagTable textTagTable
    +textBufferTagTable :: (TextBufferClass self, TextTagTableClass textTagTable)
    + => ReadWriteAttr self TextTagTable textTagTable
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 1084
    --- | \'modified\' property. See 'textBufferGetModified' and
    +-- | The \'modified\' property. See 'textBufferGetModified' and
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 1270
    +
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp 36
    --- 'Graphics.UI.Gtk.Multiline.TextBuffer.textBufferGetIterAtMark'. Unlike
    +-- 'textBufferGetIterAtMark'. Unlike
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp 45
    --- 'Graphics.UI.Gtk.Multiline.TextBuffer.textBufferDeleteMark'. Once deleted
    +-- 'textBufferDeleteMark'. Once deleted
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp 52
    --- 'Graphics.UI.Gtk.Multiline.TextBuffer.textBufferCreateMark' function.
    +-- 'textBufferCreateMark' function.
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp 69
    +#if GTK_CHECK_VERSION(2,12,0)
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp 71
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp 90
    +import System.Glib.Properties
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp 96
    +-- | The name of a mark.
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp 101
    --- | Creates a text mark. [_$_]
    --- Add it to a buffer using 'textBufferAddMark'. [_$_]
    --- If name is NULL, the mark is anonymous; otherwise, the mark can be retrieved by name using 'textBufferGetMark'. [_$_]
    --- If a mark has left gravity, and text is inserted at the mark's current location, [_$_]
    --- the mark will be moved to the left of the newly-inserted text. [_$_]
    --- If the mark has right gravity (left_gravity = FALSE), the mark will end up on the right of newly-inserted text. [_$_]
    --- The standard left-to-right cursor is a mark with right gravity (when you type, the cursor stays on the right side of the text you're typing).
    +
    +#if GTK_CHECK_VERSION(2,12,0)
    +-- | Creates a text mark. Add it to a buffer using 'textBufferAddMark'. If
    +-- @name@ is @Nothing@, the mark is anonymous; otherwise, the mark can be retrieved by
    +-- this name
    +-- using 'textBufferGetMark'. If a mark has left gravity, and text is inserted
    +-- at the mark's current location, the mark will be moved to the left of the
    +-- newly-inserted text. If the mark has right gravity (@leftGravity@ =
    +-- @False@), the mark will end up on the right of newly-inserted text. The
    +-- standard left-to-right cursor is a mark with right gravity (when you type,
    +-- the cursor stays on the right side of the text you\'re typing).
    +--
    +-- * Available since Gtk+ version 2.12
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp 125
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp 150
    --- 'Graphics.UI.Gtk.Multiline.TextBuffer.textBufferDeleteMark'. Marks can't
    +-- 'textBufferDeleteMark'. Marks can't
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp 190
    --- | \'visible\' property. See 'textMarkGetVisible' and 'textMarkSetVisible'
    +-- | Retreives the name of a mark.
    +--
    +textMarkName :: TextMarkClass self => ReadAttr self (Maybe MarkName)
    +textMarkName = readAttrFromMaybeStringProperty "name"
    +
    +-- | The \'visible\' property. See 'textMarkGetVisible' and 'textMarkSetVisible'
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextMark.chs.pp 202
    +-- | Determines whether the mark keeps to the left when text is inserted at its position.
    +--
    +textMarkLeftGravity :: TextMarkClass self => ReadAttr self Bool
    +textMarkLeftGravity = readAttrFromBoolProperty "left-gravity"
    +
    +
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 85
    +#if GTK_CHECK_VERSION(2,14,0)
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 87
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 120
    +#if GTK_CHECK_VERSION(2,12,0)
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 122
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 148
    +#if GTK_CHECK_VERSION(2,2,0)
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 150
    +#if GTK_CHECK_VERSION(2,16,0)
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 152
    +#endif
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 181
    +#if GTK_CHECK_VERSION(2,12,0)
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 184
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 194
    +#if GTK_CHECK_VERSION(2,12,0)
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 196
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 653
    +#if GTK_CHECK_VERSION(2,14,0)
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 664
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 959
    +#if GTK_CHECK_VERSION(2,12,0)
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 962
    --- Normally, startup identifier is managed automatically and you should only use this function in special cases like transferring focus from other processes. You should use this function before calling gtk_window_present() or any equivalent function generating a window map event.
    +-- Normally, startup identifier is managed automatically and you should only use this function in special cases like transferring focus from other processes. You should use this function before calling 'windowPresent' or any equivalent function generating a window map event.
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 976
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 1341
    --- | Sets an icon to be used as fallback for windows that haven't had 'windowSetIconList' called on them from a file on disk. [_$_]
    -windowSetDefaultIconFromFile :: [_$_]
    -   String [_$_]
    - -> GError [_$_]
    - -> IO Bool
    -windowSetDefaultIconFromFile filename error = liftM toBool $
    -  withUTFString filename $ \filePtr -> [_$_]
    -  with error $ \gErrorPtr -> [_$_]
    -  {# call window_set_default_icon_from_file #}
    -    filePtr
    -    (castPtr gErrorPtr)
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 1342
    --- | Returns the fallback icon name for windows that has been set with 'windowSetDefaultIconName'. [_$_]
    --- The returned string is owned by GTK+ and should not be modified. [_$_]
    --- It is only valid until the next call to 'windowSetDefaultIconName'.
    +#if GTK_CHECK_VERSION(2,2,0)
    +-- | Sets an icon to be used as fallback for windows that haven't had
    +-- 'windowSetIconList' called on them from a file on disk. May throw a 'GError' if
    +--  the file cannot be loaded.
    +--
    +-- * Available since Gtk+ version 2.2
    +--
    +windowSetDefaultIconFromFile ::
    +    String  -- ^ @filename@ - location of icon file
    + -> IO Bool -- ^ returns @True@ if setting the icon succeeded.
    +windowSetDefaultIconFromFile filename =
    +  liftM toBool $
    +  propagateGError $ \errPtr ->
    +  withUTFString filename $ \filenamePtr ->
    +  {# call gtk_window_set_default_icon_from_file #}
    +    filenamePtr
    +    errPtr
    +#endif
    +
    +#if GTK_CHECK_VERSION(2,16,0)
    +-- | Returns the fallback icon name for windows that has been set with
    +-- 'windowSetDefaultIconName'.
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 1367
    -windowGetDefaultIconName :: IO String
    -windowGetDefaultIconName = [_$_]
    -  {# call window_get_default_icon_name #} >>= peekCString
    +windowGetDefaultIconName ::
    +    IO String -- ^ returns the fallback icon name for windows
    +windowGetDefaultIconName =
    +  {# call window_get_default_icon_name #}
    +  >>= peekUTFString
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 1857
    +#if GTK_CHECK_VERSION(2,12,0)
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 1860
    --- On X11 this has any effect only on X screens with a compositing manager running. See gtk_widget_is_composited().
    --- On Windows it should work always.
    +-- On X11 this has any effect only on X screens with a compositing manager running.
    +-- See 'widgetIsComposited'. On Windows it should work always.
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 1863
    --- Note that setting a window's opacity after the window has been shown causes it to flicker once on Windows.
    +-- Note that setting a window's opacity after the window has been shown causes it to
    +-- flicker once on Windows.
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 1882
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 1949
    +#if GTK_CHECK_VERSION(2,12,0)
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs.pp 1960
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/WindowGroup.chs.pp 48
    +#if GTK_CHECK_VERSION(2,14,0)
    hunk ./gtk/Graphics/UI/Gtk/Windows/WindowGroup.chs.pp 50
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/WindowGroup.chs.pp 95
    --- | Returns a list of the GtkWindows that belong to window_group.
    +#if GTK_CHECK_VERSION(2,14,0)
    +-- | Returns a list of the 'Window's that belong to @windowGroup@.
    hunk ./gtk/Graphics/UI/Gtk/Windows/WindowGroup.chs.pp 100
    -windowGroupListWindows :: WindowGroupClass self => self
    - -> IO [Pixbuf]  -- ^ return A newly-allocated list of windows inside the group. [_$_]
    +windowGroupListWindows :: WindowGroupClass self
    +  => self -- ^ @windowGroup@ - the window group
    + -> IO [Window]  -- ^ returns the list of windows inside this group
    hunk ./gtk/Graphics/UI/Gtk/Windows/WindowGroup.chs.pp 106
    -  mapM (makeNewGObject mkPixbuf . return) ptrList
    +  mapM (makeNewGObject mkWindow . return) ptrList
    +#endif