[Gtk2hs-commit] (main branch): import less stuff when building gtk3

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

diffing dir...
Thu Jul 11 17:18:42 BST 2013  Daniel Wagner <da...@wa...>
  * import less stuff when building gtk3
  Ignore-this: 3aa60811214d9e1e6726a79838f74a5e
    move ./gtk/Graphics/UI/Gtk/ModelView.hs ./gtk/Graphics/UI/Gtk/ModelView.chs
    hunk ./gtk/Graphics/UI/Gtk.chs 60
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 62
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 64
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 66
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 70
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 72
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 151
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 153
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 155
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 157
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 162
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 164
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 189
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 191
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 198
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 203
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 258
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 260
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 309
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 311
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 315
    -#else
    -import Graphics.UI.Gtk.Gdk.Region
    hunk ./gtk/Graphics/UI/Gtk.chs 319
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 321
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 404
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 406
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 408
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 410
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 416
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 418
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 444
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 446
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 458
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 463
    +#endif
    hunk ./gtk/Graphics/UI/Gtk.chs 512
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk.chs 514
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 438
    -{#import Graphics.UI.Gtk.Gdk.Region#}	(
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 439
    -    Region(..), makeNewRegion
    +{#import Graphics.UI.Gtk.Gdk.Region#}	(Region(..), makeNewRegion)
    +{#import Graphics.UI.Gtk.Gdk.Pixmap#} (Bitmap)
    hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 442
    -    )
    -{#import Graphics.UI.Gtk.Gdk.Pixmap#} (
    -#if GTK_MAJOR_VERSION < 3
    -    Bitmap
    -#endif
    -    )
    hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 79
    -#else
    -{#import Graphics.UI.Gtk.Gdk.Region#} ()
    hunk ./gtk/Graphics/UI/Gtk/Embedding/Plug.chs 90
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk/Embedding/Plug.chs 92
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Embedding/Socket.chs 127
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk/Embedding/Socket.chs 129
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 104
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 106
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 81
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 83
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 95
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 97
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/ModelView.chs 1
    +{-# LANGUAGE CPP #-}
    hunk ./gtk/Graphics/UI/Gtk/ModelView.chs 43
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk/ModelView.chs 45
    +#endif
    hunk ./gtk/Graphics/UI/Gtk/ModelView.chs 70
    +#if GTK_MAJOR_VERSION < 3
    hunk ./gtk/Graphics/UI/Gtk/ModelView.chs 72
    +#endif