From: Andy S. <And...@co...> - 2010-03-22 08:27:31
|
Mon Mar 22 04:25:43 EDT 2010 Andy Stewart <laz...@gm...> * Update all `Scrolling` modules to Gtk+ 2.18.3 Ignore-this: c100ef0fe00c0e56866fff0205f65674 hunk ./ApiUpdateTodoList.txt 302 -** TODO Directory: gtk-modules/Graphics/UI/Gtk/Scrolling -*** TODO HScrollbar.chs -*** TODO ScrolledWindow.chs.pp -*** TODO VScrollbar.chs +** DONE Directory: gtk-modules/Graphics/UI/Gtk/Scrolling +*** DONE HScrollbar.chs +*** DONE ScrolledWindow.chs.pp +*** DONE VScrollbar.chs hunk ./gtk/Graphics/UI/Gtk/Scrolling/HScrollbar.chs 8 --- Copyright (C) 1999-2005 Axel Simon +-- Copyright (C) 1999-2009 Axel Simon hunk ./gtk/Graphics/UI/Gtk/Scrolling/HScrollbar.chs 28 + hunk ./gtk/Graphics/UI/Gtk/Scrolling/HScrollbar.chs 40 +-- hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs.pp 8 --- Copyright (C) 1999-2005 Axel Simon +-- Copyright (C) 1999-2009 Axel Simon hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs.pp 28 + hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs.pp 66 +-- hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs.pp 96 +#if GTK_CHECK_VERSION(2,10,0) + scrolledWindowUnsetPlacement, +#endif hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs.pp 114 - scrolledWindowWindowPlacement, hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs.pp 115 - scrolledWindowPlacement, + scrolledWindowWindowPlacement, + scrolledWindowWindowPlacementSet, + +-- * Signals + moveFocusOut, + scrollChild, hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs.pp 130 +{#import Graphics.UI.Gtk.Signals#} hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs.pp 132 -import Graphics.UI.Gtk.General.Enums (PolicyType(..), CornerType(..), ShadowType(..)) +import Graphics.UI.Gtk.General.Enums (PolicyType(..), CornerType(..), ShadowType(..), [_$_] + DirectionType(..), ScrollType(..)) hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs.pp 255 +#if GTK_CHECK_VERSION(2,10,0) +-- | Unsets the placement of the contents with respect to the scrollbars for +-- the scrolled window. If no window placement is set for a scrolled window, it +-- obeys the \"gtk-scrolled-window-placement\" XSETTING. +-- +-- See also 'scrolledWindowSetPlacement' and 'scrolledWindowGetPlacement'. +-- +-- * Available since Gtk+ version 2.10 +-- +scrolledWindowUnsetPlacement :: ScrolledWindowClass self => self -> IO () +scrolledWindowUnsetPlacement self = + {# call gtk_scrolled_window_unset_placement #} + (toScrolledWindow self) +#endif + hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs.pp 374 +-- | Whether 'windowPlacement' should be used to determine the location of the contents with respect to +-- the scrollbars. Otherwise, the 'gtkScrolledWindowPlacement' setting is used. +-- [_$_] +-- Default value: 'False' +-- [_$_] +-- Since 2.10 +scrolledWindowWindowPlacementSet :: ScrolledWindowClass self => Attr self Bool +scrolledWindowWindowPlacementSet = newAttrFromBoolProperty "window-placement-set" + hunk ./gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.chs.pp 392 --- | \'placement\' property. See 'scrolledWindowGetPlacement' and --- 'scrolledWindowSetPlacement' --- -scrolledWindowPlacement :: ScrolledWindowClass self => Attr self CornerType -scrolledWindowPlacement = newAttr - scrolledWindowGetPlacement - scrolledWindowSetPlacement +----------------- +-- Signals +-- | +moveFocusOut :: ScrolledWindowClass self => Signal self (DirectionType -> IO ()) +moveFocusOut = Signal (connect_ENUM__NONE "move-focus-out") + +-- | +scrollChild :: ScrolledWindowClass self => Signal self (ScrollType -> Bool -> IO Bool) +scrollChild = Signal (connect_ENUM_BOOL__BOOL "scroll-child") hunk ./gtk/Graphics/UI/Gtk/Scrolling/VScrollbar.chs 8 --- Copyright (C) 1999-2005 Axel Simon +-- Copyright (C) 1999-2009 Axel Simon hunk ./gtk/Graphics/UI/Gtk/Scrolling/VScrollbar.chs 28 + hunk ./gtk/Graphics/UI/Gtk/Scrolling/VScrollbar.chs 40 +-- hunk ./tools/callbackGen/gtkmarshal.list 157 +# for Scrolling +BOOLEAN:NONE +BOOLEAN:ENUM,BOOLEAN |