Menu
▾
▴
[Gtk2hs-commit] (main branch): Add a flag gtk3 to build using gtk3 rather than gtk2
|
From: Daniel W. <dm...@lu...> - 2013-02-15 01:57:44
|
diffing dir...
Sun Jul 15 16:12:46 BST 2012 ult...@gm...
* Add a flag gtk3 to build using gtk3 rather than gtk2
Ignore-this: 37643d6c4902894d86c9684ba9c47ce9
The build works on a linux machine with gtk3.2. The only change to gtk2 builds
is that Gtk2HsStore.h now imports all of gtk (<gtk/gtk.h) rather than specific
bits.
There are a couple of problems with this patch:
* GdkRegion has been repaced by cairo_region_t, this patch simply removes all
functions that involve Region
* Functions in Structs.hsc that peek in structs have been removed (structs
mostly been made opaque in gtk3) along with functions that depend on them.
They should be replace by accessor versions.
hunk ./gtk/Graphics/UI/Gtk.chs 291
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk.chs 293
+#else
+import Graphics.UI.Gtk.Gdk.Region
+#endif
hunk ./gtk/Graphics/UI/Gtk.chs 491
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk.chs 497
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 55
--- The functions 'boxPackStartDefaults' or 'boxPackEndDefaults' [_$_]
--- are a convenient way to pack widgets into a 'Box' without specifying
--- these extra paramters.
hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 66
--- the box, and they will be packed as if with 'boxPackStartDefaults'. Use
--- 'Graphics.UI.Gtk.Abstract.Container.containerRemove' to remove widgets
--- from the 'Box'.
+-- the box, and they will be packed as if with 'boxPackStart' with 'PackRepel'
+-- and 0 padding. Use 'Graphics.UI.Gtk.Abstract.Container.containerRemove' to
+-- remove widgets from the 'Box'.
hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 108
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 111
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 198
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 202
+-- Removed in Gtk3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 214
+-- Removed in Gtk3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Box.chs 222
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 40
+-- Object has been removed in Gt3k, but this module still provides useful
+-- functions.
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 56
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 62
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 76
-
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 109
-
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 114
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 116
+#else
+makeNewObject :: GObjectClass obj => [_$_]
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 140
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 142
+#else
+objectWeakref :: GObjectClass o => o -> IO () -> IO GWeakNotify
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 157
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 159
+#else
+objectWeakunref :: GObjectClass o => o -> GWeakNotify -> IO ()
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 173
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 175
+#else
+objectDestroy :: WidgetClass self => Signal self (IO ())
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 189
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 191
+#else
+notifyProperty :: GObjectClass self => ReadWriteAttr self a b -> Signal self (IO ())
+#endif
duplicate
|hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 195
|-
|:
hunk ./gtk/Graphics/UI/Gtk/Abstract/Object.chs 195
+
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 54
- UpdateType(..),
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 57
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 82
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 84
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 127
-import Graphics.UI.Gtk.General.Enums (UpdateType(..), ScrollType(..))
+import Graphics.UI.Gtk.General.Enums (ScrollType(..))
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 161
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 164
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 172
+
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 181
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 189
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 409
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 413
---
+-- [_$_]
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs 419
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 69
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 72
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 87
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 89
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 91
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 93
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 120
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 122
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 127
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 130
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 133
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 136
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 142
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 146
- widgetGetDefaultStyle,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 147
+#endif
+ widgetGetDefaultStyle,
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 153
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 158
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 164
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 168
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 188
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 190
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 195
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 198
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 221
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 223
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 235
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 238
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 259
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 261
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 264
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 266
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 423
-{#import Graphics.UI.Gtk.Gdk.Region#} (Region(..), makeNewRegion)
-{#import Graphics.UI.Gtk.Gdk.Pixmap#} (Bitmap)
+{#import Graphics.UI.Gtk.Gdk.Region#} (
+#if GTK_MAJOR_VERSION < 3
+ Region(..), makeNewRegion
+#endif
+ )
+{#import Graphics.UI.Gtk.Gdk.Pixmap#} (
+#if GTK_MAJOR_VERSION < 3
+ Bitmap
+#endif
+ )
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 439
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 441
- ,widgetGetDrawWindow, widgetGetSize)
+ ,widgetGetDrawWindow, widgetGetSize
+#endif
+ )
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 523
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 531
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 541
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 544
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 549
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 942
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 965
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1000
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1023
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1112
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1143
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1155
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1164
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1213
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1232
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1234
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1258
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1301
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1333
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1719
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1727
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1816
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1823
+-- Removed in Gtk3. [_$_]
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1836
+#endif
+
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1839
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1859
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1875
+-- Returns a GObject in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1877
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1879
+#else
+ -> IO GObject -- ^ returns the 'GObject' associated with @widget@
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1883
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 1885
+#else
+ makeNewGObject mkGObject $
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2215
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2222
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2231
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2462
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2468
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2473
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2492
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2496
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs 2501
+#endif
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 103
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 106
+#endif
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 304
-
+ [_$_]
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 314
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 325
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs 333
+#endif
hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs 75
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs 77
+#endif
hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs 133
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs 140
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs 154
+#endif
hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 53
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 55
+ region,
+#endif
hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 59
- region,
hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 75
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 77
+#else
+{#import Graphics.UI.Gtk.Gdk.Region#} ()
+#endif
hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 96
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 99
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 111
+#endif
hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 130
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 133
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Cairo.chs 141
+#endif
+
hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 126
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 128
+ imageMask,
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 132
- imageMask,
hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 383
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 390
--- | A 'Image' to display.
---
-imageImage :: ImageClass image => ReadWriteAttr Image Image image
-imageImage = newAttrFromObjectProperty "image"
- {# call pure unsafe gtk_image_get_type #}
-
hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs 395
+#endif
+
+-- | A 'Image' to display.
+--
+imageImage :: ImageClass image => ReadWriteAttr Image Image image
+imageImage = newAttrFromObjectProperty "image"
+ {# call pure unsafe gtk_image_get_type #}
hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 80
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 84
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 91
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 93
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 111
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 113
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 204
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 221
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 249
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 254
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Display/ProgressBar.chs 259
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 89
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 91
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 94
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 97
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 112
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 114
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 347
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 351
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 360
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 385
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 391
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 403
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 410
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 539
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 545
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs 548
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 86
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 89
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 98
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 100
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 200
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 216
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 246
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 251
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Display/Statusbar.chs 256
+#endif
hunk ./gtk/Graphics/UI/Gtk/Embedding/Plug.chs 193
- {# call pure unsafe gdk_window_object_get_type #}
+ {# call pure unsafe gdk_window_get_type #}
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 62
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 67
+#endif
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 90
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 95
+#endif
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 252
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 259
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 272
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 280
+#endif
conflictor [
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 485
-#if GTK_CHECK_VERSION(2,18,0)
--- | Get the 'EntryBuffer' object which holds the text for this widget.
-entryGetBuffer :: EntryClass self => self
- -> IO EntryBuffer
-entryGetBuffer self =
- makeNewGObject mkEntryBuffer $
- {# call gtk_entry_get_buffer #}
- (toEntry self)
-
--- | Set the 'EntryBuffer' object which holds the text for this widget.
-entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self
- -> buffer -> IO ()
-entrySetBuffer self =
- {# call gtk_entry_set_buffer #}
- (toEntry self) . toEntryBuffer
-#endif
-
]
|:
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 502
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 508
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 523
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs 531
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Cursor.chs 40
--- * Methods [_$_]
+-- * Methods
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Cursor.chs 43
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Cursor.chs 64
-{#pointer *Cursor foreign newtype #}
+{#pointer *GdkCursor as Cursor foreign newtype #}
hunk ./gtk/Graphics/UI/Gtk/Gdk/Cursor.chs 95
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Cursor.chs 100
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Cursor.chs 117
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 57
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 61
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 65
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 67
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 70
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 73
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 80
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 83
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 90
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 92
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 106
-import Graphics.UI.Gtk.Gdk.EventM (Modifier, eventRegion)
+import Graphics.UI.Gtk.Gdk.EventM (Modifier,
+#if GTK_MAJOR_VERSION < 3
+ eventRegion,
+#endif
+ )
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 147
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 150
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 158
+-- Removed in Gtk3. [_$_]
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 176
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 190
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 241
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 279
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 287
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 317
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 338
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 340
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 348
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 354
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 413
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 451
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 453
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 489
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 598
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 602
+--
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs 607
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 37
+-- This module is empty when built with Gtk3 because GTKDrawable has been
+-- removed.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 40
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 69
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 72
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Drawable.chs 386
-
+#endif /* GTK_MAJOR_VERSION < 3 */
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 29
- CapStyle(..),
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 30
- Dither(..),
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 35
- Fill(..),
- Function(..),
- InputCondition(..),
- JoinStyle(..),
- LineStyle(..),
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 37
- SubwindowMode(..),
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 46
+#if GTK_MAJOR_VERSION < 3
+ CapStyle(..),
+ Dither(..),
+ Fill(..),
+ Function(..),
+ InputCondition(..),
+ JoinStyle(..),
+ LineStyle(..),
+ SubwindowMode(..),
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 62
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 65
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 67
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 99
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 102
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 104
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 175
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 178
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 183
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 189
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 196
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 201
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 203
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 232
+
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 236
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Enums.chs 238
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 142
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 144
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 184
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 186
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 544
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 546
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 555
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 74
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 76
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 206
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 208
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 434
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 438
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 443
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 445
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 448
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 451
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 41
+--
+-- Graphics Contexts are removed in Gtk3, so this module is empty.
hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 44
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 80
- gcSetDashes) where
+ gcSetDashes
+#endif
+ ) where
hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 84
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/GC.chs 177
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 114
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 119
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 133
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 135
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 716
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 729
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 739
-
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 742
+--
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 785
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 802
-
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs 32
+-- This module is empty when built with Gtk3 because Pixmap has been
+-- removed.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs 47
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs 54
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs 57
+#if GTK_MAJOR_VERSION < 3
+
hunk ./gtk/Graphics/UI/Gtk/Gdk/Pixmap.chs 111
+
+#endif /* GTK_MAJOR_VERSION < 3 */
hunk ./gtk/Graphics/UI/Gtk/Gdk/Region.chs 36
+-- This module is empty when built with Gtk3 because Pixmap has been
+-- removed.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Region.chs 39
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Region.chs 60
- regionXor) where
+ regionXor
+#endif
+ ) where
+
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Region.chs 227
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 60
+#if GTK_MAJOR_VERSION <3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 69
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 105
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 107
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 151
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 171
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 190
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 200
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 534
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 539
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Gdk/Screen.chs 544
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 73
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 77
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 155
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 158
- dragContextGetAction, dragContextSetAction )
+ dragContextGetAction, dragContextSetAction
+#endif
+ )
hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 170
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 174
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Drag.chs 188
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 44
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 48
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 50
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 54
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 63
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 65
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 74
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 79
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 89
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 92
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 99
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 101
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 227
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 231
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 234
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 240
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 243
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 245
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 315
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 319
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 321
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 370
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 374
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 379
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 382
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 432
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 436
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 441
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 443
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 463
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 466
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs 468
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 52
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 56
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 297
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 299
+--
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 311
+--
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 331
+--
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 337
+#endif
duplicate
|hunk ./gtk/Graphics/UI/Gtk/General/General.chs 428
|-
|:
hunk ./gtk/Graphics/UI/Gtk/General/General.chs 428
+
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 73
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 75
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 87
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 89
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 116
- selectionDataGetType)
+#if GTK_MAJOR_VERSION < 3
+ selectionDataGetType
+#endif
+ )
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 268
+-- The GtkSelectionData struct was made opaque in Gtk3, but the accessor routines
+-- where introduced in 2.14.
+#if GTK_CHECK_VERSION(2,14,0)
+selectionDataGet_format selPtr = {#call gtk_selection_data_get_format#} selPtr
+selectionDataGet_length selPtr = {#call gtk_selection_data_get_length#} selPtr
+selectionDataGet_data selPtr = {#call gtk_selection_data_get_data#} selPtr
+selectionDataGet_target selPtr = {#call gtk_selection_data_get_target#} selPtr
+#else
+selectionDataGet_format selPtr = {#get SelectionData -> format#} selPtr
+selectionDataGet_length selPtr = {#get SelectionData -> length#} selPtr
+selectionDataGet_data selPtr = {#get SelectionData -> data#} selPtr
+selectionDataGet_target selPtr = {#get SelectionData -> target#} selPtr
+#endif
+
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 287
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 295
- bitSize <- liftM fromIntegral $ {#get SelectionData -> format#} selPtr
- lenBytes <- liftM fromIntegral $ {#get SelectionData -> length#} selPtr
- dataPtr <- liftM castPtr $ {#get SelectionData -> data#} selPtr
+ bitSize <- liftM fromIntegral $ selectionDataGet_format selPtr
+ lenBytes <- liftM fromIntegral $ selectionDataGet_length selPtr
+ dataPtr <- liftM castPtr $ selectionDataGet_data selPtr
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 302
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 307
- liftIO $ liftM fromIntegral $ {#get SelectionData -> length#} selPtr [_$_]
+ liftIO $ liftM fromIntegral $ selectionDataGet_length selPtr [_$_]
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 403
- liftM Atom $ liftIO $ {#get SelectionData -> target#} selPtr
+ liftM Atom $ liftIO $ selectionDataGet_target selPtr
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 405
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 407
+--
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs 413
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 6
-#include <gdk/gdk.h> [_$_]
+#include <gdk/gdk.h>
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 8
-
+#if !defined(WIN32) && !HAVE_QUARTZ_GTK
+#include <gtk/gtkx.h>
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 40
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 46
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 52
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 56
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 67
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 73
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 75
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 83
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 92
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 103
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 114
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 116
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 130
-import Graphics.UI.Gtk.Gdk.Enums (Function, Fill, SubwindowMode,
- LineStyle, CapStyle, JoinStyle)
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 198
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 205
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 386
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 407
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 410
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 416
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 427
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 432
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 483
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 502
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 603
-#else
+#elif GTK_MAJOR_VERSION < 3 || (!defined(WIN32) && !HAVE_QUARTZ_GTK)
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 606
+#else
+newtype NativeWindowId = NativeWindowId #{type Window} deriving (Eq, Show)
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 620
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 627
-#endif [_$_]
+#endif
+#else
+#if defined(WIN32)
+foreign import ccall unsafe "gdk_win32_drawable_get_handle"
+ gdk_win32_drawable_get_handle :: (Ptr Drawable) -> IO (Ptr a)
+#elif !defined(HAVE_QUARTZ_GTK)
+foreign import ccall unsafe "gdk_x11_window_get_xid" [_$_]
+ gdk_x11_drawable_get_xid :: (Ptr DrawWindow) -> IO CInt
+#endif
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 638
--- | Get 'NativeWindowId' of 'Drawable'. [_$_]
+-- | Get 'NativeWindowId' of 'Drawable'.
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 641
+#else
+drawableGetID :: DrawWindowClass d => d -> IO NativeWindowId
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 646
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 648
+#else
+ (\(DrawWindow drawable) ->
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 664
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 666
+#else
+ ) (toDrawWindow d)
+#endif
+
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 671
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 677
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 684
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 739
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 743
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 748
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 751
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 764
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 766
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 778
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 791
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 804
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 814
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 822
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 927
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 929
+--
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 938
+--
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 947
+--
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 956
+--
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 987
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 1040
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 1046
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 1113
+
hunk ./gtk/Graphics/UI/Gtk/General/Style.chs 64
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Style.chs 67
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Style.chs 89
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/General/Style.chs 140
+#endif
hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 87
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 93
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 151
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 160
+-- Removed in Gtk3. Use the Widget version.
hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 170
+-- Removed in Gtk3. Use the Widget version.
hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 182
+-- Removed in Gtk3. Use the Widget version.
hunk ./gtk/Graphics/UI/Gtk/Layout/Fixed.chs 187
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/Layout/Layout.chs 66
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Layout/Layout.chs 68
+#endif
hunk ./gtk/Graphics/UI/Gtk/Layout/Layout.chs 94
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Layout/Layout.chs 96
+#endif
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 70
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 72
+#endif
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 101
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 107
+#endif
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 121
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 127
+#endif
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 208
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 210
+#endif
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 683
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 692
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 706
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 720
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 729
+#endif
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 857
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 861
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 884
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 905
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Layout/Notebook.chs 914
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 34
--- newly-written code.
+-- newly-written code. [_$_]
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 36
+-- This module is empty in Gtk3 as Combo has been removed.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 67
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 93
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 96
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Combo.chs 239
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs 52
+-- * This module is deprecated and the functionality removed in Gtk3. It is
+-- therefore empty in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs 67
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs 92
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs 95
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBoxEntry.chs 234
+#endif
conflictor [
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 104
+ menuItemActivatedItem,
+ menuItemActivated,
]
|:
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 104
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 123
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 230
- {# call menu_item_remove_submenu #}
+ {# call menu_item_set_submenu #}
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 232
+ (Widget $ unsafePerformIO $ newForeignPtr_ nullPtr)
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 353
+#if GTK_MAJOR_VERSION < 3
conflictor [
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 359
+menuItemActivatedItem :: MenuItemClass self => Signal self (IO ())
+menuItemActivatedItem = Signal (connect_NONE__NONE "activate-item")
+
+-- | Deprecated. See 'menuItemActivatedItem'.
]
|:
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 359
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 364
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 370
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 376
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 414
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.chs 68
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.chs 70
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.chs 155
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.chs 173
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs 29
--- newly-written code.
+-- newly-written code. It is empty in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs 61
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs 86
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs 100
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.chs 186
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs 68
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs 70
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs 178
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs 183
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItem.chs 197
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 94
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 111
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 115
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 118
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 138
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 140
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 145
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 148
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 179
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 184
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 211
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 230
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 256
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 270
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 284
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 311
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 325
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 347
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 376
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 391
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 408
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 430
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 444
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 454
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 464
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 470
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 497
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 500
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 512
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 518
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 678
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 683
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 688
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 709
+
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 715
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.chs 720
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 73
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 77
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 83
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 87
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 224
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 232
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 240
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 260
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 268
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Misc/Calendar.chs 280
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 83
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 86
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 94
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 96
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 113
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 116
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 123
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Misc/DrawingArea.chs 127
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/Tooltips.chs 56
+--
+-- * This module is deprecated. It is empty in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Misc/Tooltips.chs 66
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Misc/Tooltips.chs 84
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/Tooltips.chs 87
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Misc/Tooltips.chs 174
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellLayout.chs 90
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellLayout.chs 92
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 90
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 92
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 120
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 122
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 273
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 276
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRenderer.chs 280
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellView.chs 63
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellView.chs 65
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellView.chs 177
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellView.chs 180
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellView.chs 187
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 58
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 68
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 125
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 133
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 221
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 241
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 641
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.c 662
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.h 4
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreednd.h>
-#include <gtk/gtktreesortable.h>
+#include <gtk/gtk.h>
+
hunk ./gtk/Graphics/UI/Gtk/ModelView/IconView.chs 75
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/IconView.chs 78
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/IconView.chs 353
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/IconView.chs 374
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 149
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 151
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 240
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 243
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 968
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 977
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 1001
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 1018
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 1125
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 1129
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 1139
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs 58
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs 60
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs 198
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs 201
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs 208
+#endif
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 82
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 85
+#endif
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 89
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 92
+#endif
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 308
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 311
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 320
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 323
+#endif
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 346
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 349
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 358
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextTag.chs 361
+#endif
hunk ./gtk/Graphics/UI/Gtk/Selectors/ColorSelectionDialog.chs 58
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Selectors/ColorSelectionDialog.chs 63
+#endif
hunk ./gtk/Graphics/UI/Gtk/Selectors/ColorSelectionDialog.chs 72
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Selectors/ColorSelectionDialog.chs 77
+#endif
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserButton.chs 63
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserButton.chs 65
+#endif
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserButton.chs 117
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserButton.chs 120
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserButton.chs 136
+#endif
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.chs 63
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.chs 66
+#endif
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.chs 101
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.chs 107
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.chs 121
+#endif
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileFilter.chs 87
+-- Back in <X.h> DestroyNotify is defined as 17
+#undef DestroyNotify
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileSelection.chs 30
+-- This module is empty in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileSelection.chs 68
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileSelection.chs 93
+#endif
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileSelection.chs 95
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Selectors/FileSelection.chs 267
+#endif
hunk ./gtk/Graphics/UI/Gtk/Special/HRuler.chs 28
+-- * Rulers are removed in Gtk3 and thus this module is blank. There is no
+-- replacement
hunk ./gtk/Graphics/UI/Gtk/Special/HRuler.chs 50
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Special/HRuler.chs 59
+#endif
hunk ./gtk/Graphics/UI/Gtk/Special/HRuler.chs 61
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Special/HRuler.chs 80
+#endif
hunk ./gtk/Graphics/UI/Gtk/Special/Ruler.chs 38
+--
+-- * Rulers are removed in Gtk3 and thus this module is blank. There is no
+-- replacement
hunk ./gtk/Graphics/UI/Gtk/Special/Ruler.chs 53
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Special/Ruler.chs 71
-#endif [_$_]
+#endif
+#endif
hunk ./gtk/Graphics/UI/Gtk/Special/Ruler.chs 74
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Special/Ruler.chs 179
+#endif
+
hunk ./gtk/Graphics/UI/Gtk/Special/VRuler.chs 37
+--
+-- * Rulers are removed in Gtk3 and thus this module is blank. There is no
+-- replacement
hunk ./gtk/Graphics/UI/Gtk/Special/VRuler.chs 51
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Special/VRuler.chs 60
+#endif
hunk ./gtk/Graphics/UI/Gtk/Special/VRuler.chs 62
-
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Special/VRuler.chs 81
+#endif
hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 83
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 86
+#endif
hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 436
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 440
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 459
+-- Removed in Gtk3.
hunk ./gtk/Graphics/UI/Gtk/Windows/AboutDialog.chs 479
+#endif
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 110
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 113
+#endif
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 118
- dialogGetHasSeparator,
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 119
+#if GTK_MAJOR_VERSION < 3
+ dialogGetHasSeparator,
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 122
+#endif
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 132
+#if GTK_MAJOR_VERSION < 3
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 134
+#endif
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs 159
-import Graphics.UI.Gtk.General.Structs (dialogGetUpper, dialogGetActionArea,
+import Graphics.UI.Gtk.General.Structs (
+#if GTK_MAJOR...
[truncated message content] |
