gtk2hs-commit

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

Mon Oct 26 12:29:28 EDT 2009  Axe...@en...
  * Fix various usages of the mk... functions.

    hunk ./gtk/Graphics/UI/Gtk.hs.pp 217
    +  module System.Glib.GObject,
    hunk ./gtk/Graphics/UI/Gtk.hs.pp 420
    -
    +import System.Glib.GObject (
    +  GObject,
    +  GObjectClass,
    +  toGObject,
    +  castToGObject,
    +  quarkFromString,
    +  objectCreateAttribute,
    +  objectSetAttribute,
    +  objectGetAttributeUnsafe,
    +  isA
    +  )
    +  [_$_]
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs.pp 105
    -  (ForeignPtr obj -> obj) -> IO (Ptr obj) -> IO obj
    -makeNewObject constr generator = do
    +  (ForeignPtr obj -> obj, FinalizerPtr obj) -> IO (Ptr obj) -> IO obj
    +makeNewObject (constr, objectUnref) generator = do
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 1019
    -    (fromMaybe (mkStyle nullForeignPtr) style)
    +    (fromMaybe (Style nullForeignPtr) style)
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 1136
    -  case (fromMaybe (mkPixmap nullForeignPtr) shapeMask) of
    +  case (fromMaybe (Pixmap nullForeignPtr) shapeMask) of
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 1159
    -  case (fromMaybe (mkPixmap nullForeignPtr) shapeMask) of
    +  case (fromMaybe (Pixmap nullForeignPtr) shapeMask) of
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 1618
    -    (fromMaybe (mkAdjustment nullForeignPtr) hadjustment)
    -    (fromMaybe (mkAdjustment nullForeignPtr) vadjustment)
    +    (fromMaybe (Adjustment nullForeignPtr) hadjustment)
    +    (fromMaybe (Adjustment nullForeignPtr) vadjustment)
    hunk ./gtk/Graphics/UI/Gtk/Gdk/Gdk.chs 139
    -    (maybe (mkDrawWindow nullForeignPtr) toDrawWindow mbConfine_to)
    +    (maybe (DrawWindow nullForeignPtr) toDrawWindow mbConfine_to)
    hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs.pp 709
    -    (mkPixbuf nullForeignPtr) (toDrawable d) (mkColormap nullForeignPtr)
    +    (Pixbuf nullForeignPtr) (toDrawable d) (Colormap nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs.pp 87
    -      (maybe (mkDrawable nullForeignPtr) toDrawable mbDrawable)
    +      (maybe (Drawable nullForeignPtr) toDrawable mbDrawable)
    hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs.pp 101
    -      (maybe (mkDrawWindow nullForeignPtr) toDrawWindow mbDrawWindow)
    +      (maybe (DrawWindow nullForeignPtr) toDrawWindow mbDrawWindow)
    hunk ./gtk/Graphics/UI/Gtk/General/General.chs 102
    --- check however we do not compile users programs with this headder so if
    +-- check however we do not compile users programs with this header so if
    hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 222
    -    (maybe (mkWidget nullForeignPtr) toWidget widget)
    +    (maybe (Widget nullForeignPtr) toWidget widget)
    hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 235
    -    (maybe (mkWidget nullForeignPtr) toWidget widget)
    +    (maybe (Widget nullForeignPtr) toWidget widget)
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 168
    -  -- ^ The mouse button from the 'Graphics.UI.Gtk.Gdk.Events.Button' event and
    -  -- the time of the event. These values are used to match the corresponding
    -  -- release of the button. If this context menu is shown by programmatic
    -  -- means, supply @Nothing@.
    +  -- ^ The mouse button returned by 'Graphics.UI.Gtk.Gdk.EventM.eventButton' and
    +  -- the time of the event returned by 'Graphics.UI.Gtk.Gdk.eventTime'. These
    +  -- values are used to match the corresponding release of the button. If this
    +  -- context menu is shown by programmatic means, supply @Nothing@.
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 176
    -    (mkWidget nullForeignPtr)
    -    (mkWidget nullForeignPtr)
    +    (Widget nullForeignPtr)
    +    (Widget nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 186
    -    (mkWidget nullForeignPtr)
    -    (mkWidget nullForeignPtr)
    +    (Widget nullForeignPtr)
    +    (Widget nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs.pp 286
    -    toolbarChildToggleButton (mkWidget nullForeignPtr) lblPtr [_$_]
    +    toolbarChildToggleButton (Widget nullForeignPtr) lblPtr [_$_]
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs.pp 347
    -    toolbarChildRadioButton (maybe (mkWidget nullForeignPtr) toWidget rb) [_$_]
    +    toolbarChildRadioButton (maybe (Widget nullForeignPtr) toWidget rb) [_$_]
    hunk ./gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs 59
    -import System.Glib.GObject			(makeNewGObject)
    +{#import System.Glib.GObject#}			(GObjectClass(..), GObject(..), unGObject,
    +                                                 makeNewGObject, objectUnref)
    hunk ./gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs 102
    -  toGObject (CustomStore tm) = mkGObject (castForeignPtr tm)
    +  toGObject (CustomStore tm) = GObject (castForeignPtr tm)
    hunk ./gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs 242
    -  liftM con $ makeNewGObject CustomStore $
    +  liftM con $ makeNewGObject (CustomStore, objectUnref) $
    hunk ./gtk/Graphics/UI/Gtk/ModelView/IconView.chs.pp 630
    -    (mkCellRenderer nullForeignPtr)
    +    (CellRenderer nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeModelSort.chs.pp 82
    -  toGObject (TypedTreeModelSort tm) = mkGObject (castForeignPtr tm)
    +  toGObject (TypedTreeModelSort tm) = GObject (castForeignPtr tm)
    hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs.pp 489
    -    (mkTreeViewColumn nullForeignPtr)
    +    (TreeViewColumn nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs.pp 642
    -    (mkTreeViewColumn nullForeignPtr)
    +    (TreeViewColumn nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs.pp 1301
    -    (mkEntry nullForeignPtr)
    +    (Entry nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextIter.chs.pp 317
    -  {#call unsafe text_iter_begins_tag#} ti (mkTextTag nullForeignPtr)
    +  {#call unsafe text_iter_begins_tag#} ti (TextTag nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextIter.chs.pp 329
    -  {#call unsafe text_iter_ends_tag#} ti (mkTextTag nullForeignPtr)
    +  {#call unsafe text_iter_ends_tag#} ti (TextTag nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextIter.chs.pp 341
    -  {#call unsafe text_iter_toggles_tag#} ti (mkTextTag nullForeignPtr)
    +  {#call unsafe text_iter_toggles_tag#} ti (TextTag nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextIter.chs.pp 350
    -  {#call unsafe text_iter_has_tag#} ti (mkTextTag nullForeignPtr)
    +  {#call unsafe text_iter_has_tag#} ti (TextTag nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextIter.chs.pp 778
    -    (fromMaybe (mkTextTag nullForeignPtr) tt)
    +    (fromMaybe (TextTag nullForeignPtr) tt)
    hunk ./gtk/Graphics/UI/Gtk/Multiline/TextIter.chs.pp 790
    -    (fromMaybe (mkTextTag nullForeignPtr) tt)
    +    (fromMaybe (TextTag nullForeignPtr) tt)
    hunk ./gtk/Graphics/UI/Gtk/Scrolling/HScrollbar.chs 86
    -hScrollbarNewDefaults = hScrollbarNew (mkAdjustment nullForeignPtr)
    +hScrollbarNewDefaults = hScrollbarNew (Adjustment nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/Scrolling/VScrollbar.chs 86
    -vScrollbarNewDefaults = vScrollbarNew (mkAdjustment nullForeignPtr)
    +vScrollbarNewDefaults = vScrollbarNew (Adjustment nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/Selectors/ColorButton.chs.pp 134
    --- | Sets @color@ to be the current color in the 'ColorButton' widget.
    +-- | Returns the current color value.
    hunk ./gtk/Graphics/UI/Gtk/TreeList/TreeView.chs.pp 453
    -    (mkTreeViewColumn nullForeignPtr)
    +    (TreeViewColumn nullForeignPtr)
    hunk ./gtk/Graphics/UI/Gtk/TreeList/TreeView.chs.pp 603
    -    (mkTreeViewColumn nullForeignPtr)
    +    (TreeViewColumn nullForeignPtr)