[Gtk2hs-commit] (main branch): data IconSize instead of just Int

[Peter g. <pg...@co...>]

Fri Jun 27 21:37:50 EDT 2008  Marco T[_\c3_][_\ba_]lio Gontijo e Silva <ma...@ri...>
  * data IconSize instead of just Int

    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 1119
    --- size such as 'Graphics.UI.Gtk.General.IconFactory.iconSizeMenu'.
    +-- size such as 'Graphics.UI.Gtk.General.IconFactory.IconSizeMenu'.
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 1131
    -	      -- 'Graphics.UI.Gtk.General.IconFactory.iconSizeInvalid' means
    +	      -- 'Graphics.UI.Gtk.General.IconFactory.IconSizeInvalid' means
    hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs.pp 119
    -  IconSize,
    -  iconSizeMenu,
    -  iconSizeSmallToolbar,
    -  iconSizeLargeToolbar,
    -  iconSizeButton,
    -  iconSizeDialog,
    +  IconSize(..),
    hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs.pp 148
    -import Graphics.UI.Gtk.General.Structs	(IconSize, iconSizeMenu,
    -					 iconSizeSmallToolbar, iconSizeButton,
    -                                         iconSizeLargeToolbar, iconSizeDialog)
    +import Graphics.UI.Gtk.General.Structs	(IconSize(..))
    hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs.pp 220
    -    (fromIntegral size)
    +    ((fromIntegral . fromEnum) size)
    hunk ./gtk/Graphics/UI/Gtk/General/IconFactory.chs.pp 105
    -  IconSize,
    -  iconSizeInvalid,
    -  iconSizeMenu,
    -  iconSizeSmallToolbar,
    -  iconSizeLargeToolbar,
    -  iconSizeButton,
    -  iconSizeDialog,
    +  IconSize(..),
    hunk ./gtk/Graphics/UI/Gtk/General/IconFactory.chs.pp 121
    -import Graphics.UI.Gtk.General.Structs	(IconSize, iconSizeInvalid,
    -					 iconSizeMenu, iconSizeSmallToolbar,
    -					 iconSizeLargeToolbar, iconSizeButton,
    -					 iconSizeDialog)
    +import Graphics.UI.Gtk.General.Structs	(IconSize(..))
    hunk ./gtk/Graphics/UI/Gtk/General/IconFactory.chs.pp 266
    -  {#call icon_size_lookup#} (fromIntegral size) nullPtr nullPtr
    +  {#call icon_size_lookup#} ((fromIntegral . fromEnum) size) nullPtr nullPtr
    hunk ./gtk/Graphics/UI/Gtk/General/IconFactory.chs.pp 271
    -iconSizeRegister height name width = liftM fromIntegral $
    +iconSizeRegister height name width = liftM (toEnum . fromIntegral) $
    hunk ./gtk/Graphics/UI/Gtk/General/IconFactory.chs.pp 279
    -  {#call unsafe icon_size_register_alias#} strPtr (fromIntegral target)
    +  {#call unsafe icon_size_register_alias#} strPtr ((fromIntegral . fromEnum) target)
    hunk ./gtk/Graphics/UI/Gtk/General/IconFactory.chs.pp 287
    -iconSizeFromName name = liftM fromIntegral $
    +iconSizeFromName name = liftM (toEnum . fromIntegral) $
    hunk ./gtk/Graphics/UI/Gtk/General/IconFactory.chs.pp 296
    -  strPtr <- {#call unsafe icon_size_get_name#} (fromIntegral size)
    +  strPtr <- {#call unsafe icon_size_get_name#} ((fromIntegral . fromEnum) size)
    hunk ./gtk/Graphics/UI/Gtk/General/IconFactory.chs.pp 333
    -  if (toBool res) then return Nothing else liftM (Just .fromIntegral) $
    +  if (toBool res) then return Nothing else liftM (Just . toEnum . fromIntegral) $
    hunk ./gtk/Graphics/UI/Gtk/General/IconFactory.chs.pp 406
    -  {#call unsafe icon_source_set_size#} is (fromIntegral size)
    +  {#call unsafe icon_source_set_size#} is ((fromIntegral . fromEnum) size)
    hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 56
    -  IconSize,
    -  iconSizeInvalid,
    -  iconSizeMenu,
    -  iconSizeSmallToolbar,
    -  iconSizeLargeToolbar,
    -  iconSizeButton,
    -  iconSizeDialog,
    +  IconSize(..),
    hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 565
    -type IconSize = Int
    +data IconSize =
    +  -- | Don't scale but use any of the available sizes.
    +  IconSizeInvalid
    hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 569
    --- | Don't scale but use any of the available sizes.
    -iconSizeInvalid      :: IconSize
    -iconSizeInvalid      = #const GTK_ICON_SIZE_INVALID
    +  -- | Icon size to use in next to menu items in drop-down menus.
    +  | IconSizeMenu
    hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 572
    --- | Icon size to use in next to menu items in drop-down menus.
    -iconSizeMenu	     :: IconSize
    -iconSizeMenu	     = #const GTK_ICON_SIZE_MENU
    +  -- | Icon size for small toolbars.
    +  | IconSizeSmallToolBar
    hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 575
    --- | Icon size for small toolbars.
    -iconSizeSmallToolbar :: IconSize
    -iconSizeSmallToolbar = #const GTK_ICON_SIZE_SMALL_TOOLBAR
    +  -- | Icon size for larger toolbars.
    +  | IconSizeLargeToolBar
    hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 578
    --- | Icon size for larger toolbars.
    -iconSizeLargeToolbar :: IconSize
    -iconSizeLargeToolbar = #const GTK_ICON_SIZE_LARGE_TOOLBAR
    +  -- | Icon size for icons in buttons, next to the label.
    +  | IconSizeButton
    hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 581
    --- | Icon size for icons in buttons, next to the label.
    -iconSizeButton	     :: IconSize
    -iconSizeButton	     = #const GTK_ICON_SIZE_BUTTON
    +  -- | Icon size for icons in DragNDrop.
    +  | IconSizeDnd
    hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 584
    --- | Icon size for icons next to dialog text.
    -iconSizeDialog	     :: IconSize
    -iconSizeDialog	     = #const GTK_ICON_SIZE_DIALOG
    +  -- | Icon size for icons next to dialog text.
    +  | IconSizeDialog
    +  deriving (Show, Eq, Enum)
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs.pp 114
    -  IconSize,
    -  iconSizeInvalid,
    -  iconSizeSmallToolbar,
    -  iconSizeLargeToolbar,
    +  IconSize(..),
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs.pp 174
    -					 IconSize, iconSizeInvalid,
    -					 iconSizeSmallToolbar,
    -					 iconSizeLargeToolbar)
    +					 IconSize(..))
    hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs.pp 506
    -    (fromIntegral iconSize)
    +    ((fromIntegral . fromEnum) iconSize)