[Gtk2hs-commit] (main branch): Fix Gtk2 build

[Daniel W. <dm...@lu...>]

diffing dir...
Sun Oct  7 07:54:35 BST 2012  Hamish Mackenzie <ham...@go...>
  * Fix Gtk2 build
  Ignore-this: d1f79ad954650f03876e35f00d961946
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 128
    +#if GTK_MAJOR_VERSION < 3
    +import Graphics.UI.Gtk.General.Enums	(UpdateType(..))
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 234
    +#if GTK_CHECK_VERSION(3,0,0)
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 237
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 428
    -    , ExtensionMode(..))
    +    , ExtensionMode(..)
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2305
    +#if GTK_CHECK_VERSION(3,0,0)
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2317
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Embedding/Plug.chs 193
    -                       {# call pure unsafe gdk_window_get_type #}
    +                       {# call pure unsafe gdk_window_object_get_type #}
    hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 8
    -#if !defined(WIN32) && !HAVE_QUARTZ_GTK
    +#if GTK_MAJOR_VERSION >= 3
    hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 130
    +#if GTK_MAJOR_VERSION < 3
    +import Graphics.UI.Gtk.Gdk.Enums (Function, Fill, SubwindowMode,
    +                                  LineStyle, CapStyle, JoinStyle)
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 394
    -dialogGetContentArea = dialogGetUpper
    +dialogGetContentArea self = liftM toWidget $ dialogGetUpper self
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 153
    -#if GTK_MAJOR_VERSION >= 3
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 154
    -#endif
    +#if GTK_MAJOR_VERSION >= 3
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 156
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 2030
    +#if GTK_MAJOR_VERSION >= 3
    hunk ./gtk/Graphics/UI/Gtk/Windows/Window.chs 2039
    +#endif