Menu
▾
▴
[Gtk2hs-commit] (main branch): Add version-tag for support Gtk+ 2.12, and fix some functions.
|
From: Andy S. <And...@co...> - 2010-04-09 16:45:31
|
Fri Apr 9 12:44:12 EDT 2010 Andy Stewart <laz...@gm...>
* Add version-tag for support Gtk+ 2.12, and fix some functions.
Ignore-this: 5dc38c456b096aed3f71062f91e58097
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs.pp 104
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs.pp 106
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs.pp 468
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Abstract/Range.chs.pp 478
+#endif
hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs.pp 78
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs.pp 80
+#endif
hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs.pp 213
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Buttons/LinkButton.chs.pp 219
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs.pp 144
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs.pp 148
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs.pp 585
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Display/Image.chs.pp 595
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 118
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 122
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 146
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 149
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 540
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 550
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 715
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 734
+#endif
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 163
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 166
+#endif
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 1133
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 1151
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/AppLaunchContext.chs.pp 27
-
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/AppLaunchContext.chs.pp 43
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/AppLaunchContext.chs.pp 58
-
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/AppLaunchContext.chs.pp 141
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 101
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 103
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 122
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 125
- drawWindowReparent,
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 126
+#endif
+ drawWindowReparent,
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 144
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 146
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 157
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 159
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 171
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 173
+#endif
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 177
+#endif
+ drawGetDefaultRootWindow,
+#if GTK_CHECK_VERSION(2,18,0)
+ drawOffscreenWindowGetPixmap,
+ drawOffscreenWindowSetEmbedder,
+ drawOffscreenWindowGetEmbedder,
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 186
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 188
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 767
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 772
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 977
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1004
--- | Reparents window into the given @newParent@. The window being reparented will be unmapped as a side
--- effect.
-drawWindowReparent :: (DrawWindowClass window, DrawWindowClass parent) => window -> parent -> Int -> Int -> IO ()
-drawWindowReparent window newParent x y =
- {#call gdk_window_reparent#} [_$_]
- (toDrawWindow window) [_$_]
- (toDrawWindow newParent)
- (fromIntegral x)
- (fromIntegral y)
-
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1017
+#endif
+
+-- | Reparents window into the given @newParent@. The window being reparented will be unmapped as a side
+-- effect.
+drawWindowReparent :: (DrawWindowClass window, DrawWindowClass parent) => window -> parent -> Int -> Int -> IO ()
+drawWindowReparent window newParent x y =
+ {#call gdk_window_reparent#} [_$_]
+ (toDrawWindow window) [_$_]
+ (toDrawWindow newParent)
+ (fromIntegral x)
+ (fromIntegral y)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1252
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1260
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1426
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1441
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1594
-drawWetDefaultRootWindow :: IO DrawWindow
-drawWetDefaultRootWindow = [_$_]
+drawGetDefaultRootWindow :: IO DrawWindow
+drawGetDefaultRootWindow = [_$_]
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1598
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1601
-drawWffscreenWindowGetPixmap :: DrawWindowClass self => self -> IO Pixmap
-drawWffscreenWindowGetPixmap window =
+drawOffscreenWindowGetPixmap :: DrawWindowClass self => self -> IO Pixmap
+drawOffscreenWindowGetPixmap window =
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1611
-drawWffscreenWindowSetEmbedder :: (DrawWindowClass window, DrawWindowClass embedder) => window -> embedder -> IO ()
-drawWffscreenWindowSetEmbedder window embedder =
+drawOffscreenWindowSetEmbedder :: (DrawWindowClass window, DrawWindowClass embedder) => window -> embedder -> IO ()
+drawOffscreenWindowSetEmbedder window embedder =
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1618
-drawWffscreenWindowGetEmbedder :: DrawWindowClass self => self -> IO DrawWindow
-drawWffscreenWindowGetEmbedder window =
+drawOffscreenWindowGetEmbedder :: DrawWindowClass self => self -> IO DrawWindow
+drawOffscreenWindowGetEmbedder window =
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1622
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1624
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1630
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1632
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1651
+#endif
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1655
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Gdk/DrawWindow.chs.pp 1660
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp 136
+ clipboardWaitForURIs,
+ clipboardWaitIsURIsAvailable,
hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp 140
+ clipboardWaitForText,
+ clipboardWaitForImage,
+ clipboardWaitForRichText,
+ clipboardWaitIsTextAvailable,
+ clipboardWaitIsImageAvailable,
+ clipboardWaitIsRichTextAvailable,
+ clipboardWaitForTargets,
+ clipboardWaitIsTargetAvailable,
hunk ./gtk/Graphics/UI/Gtk/General/IconInfo.chs.pp 34
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/General/IconInfo.chs.pp 36
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/IconInfo.chs.pp 74
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/General/IconInfo.chs.pp 83
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 86
+#if GTK_CHECK_VERSION(2,14,0)
+ selectionDataGetLength,
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 89
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 328
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 333
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 425
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 431
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 46
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 48
+#endif [_$_]
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 514
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 524
+#endif [_$_]
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 75
- menuGetAccelGroup,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 77
+ menuGetAccelGroup,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 117
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 120
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 145
-import Graphics.UI.Gtk.General.Enums (ScrollType(..), ArrowPlacement(..))
+import Graphics.UI.Gtk.General.Enums (ScrollType(..))
+#if GTK_CHECK_VERSION(2,16,0)
+import Graphics.UI.Gtk.General.Enums (ArrowPlacement(..))
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 229
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 239
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 546
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 560
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/Adjustment.chs.pp 64
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Misc/Adjustment.chs.pp 75
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/Adjustment.chs.pp 152
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Misc/Adjustment.chs.pp 192
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/Adjustment.chs.pp 356
+
hunk ./gtk/Graphics/UI/Gtk/Pango/Bidirectional.chs.pp 30
+#if PANGO_CHECK_VERSION(1,22,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Bidirectional.chs.pp 32
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/Bidirectional.chs.pp 69
+#if PANGO_CHECK_VERSION(1,22,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Bidirectional.chs.pp 78
-
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/Context.chs.pp 49
+#if PANGO_CHECK_VERSION(1,22,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Context.chs.pp 52
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/Context.chs.pp 103
+#if PANGO_CHECK_VERSION(1,22,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Context.chs.pp 124
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/Enums.chs.pp 43
+#if PANGO_CHECK_VERSION(1,22,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Enums.chs.pp 45
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/Enums.chs.pp 92
+#if PANGO_CHECK_VERSION(1,22,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Enums.chs.pp 96
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/Font.chs.pp 82
+#if PANGO_CHECK_VERSION(1,22,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Font.chs.pp 84
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/Font.chs.pp 267
+#if PANGO_CHECK_VERSION(1,22,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Font.chs.pp 278
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/Script.chs.pp 36
+#if PANGO_CHECK_VERSION(1,22,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Script.chs.pp 38
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/Script.chs.pp 41
+#if PANGO_CHECK_VERSION(1,22,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Script.chs.pp 43
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/Script.chs.pp 141
+#if PANGO_CHECK_VERSION(1,22,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Script.chs.pp 147
+#endif
hunk ./gtk/Graphics/UI/Gtk/Pango/Script.chs.pp 172
+#if PANGO_CHECK_VERSION(1,22,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Script.chs.pp 194
+#endif
hunk ./gtk/Graphics/UI/Gtk/Printing/PrintSettings.chs.pp 68
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Printing/PrintSettings.chs.pp 70
+#endif
hunk ./gtk/Graphics/UI/Gtk/Printing/PrintSettings.chs.pp 195
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/Printing/PrintSettings.chs.pp 198
+#endif
hunk ./gtk/Graphics/UI/Gtk/Recent/RecentChooserMenu.chs.pp 101
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Recent/RecentChooserMenu.chs.pp 103
+#endif
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs.pp 110
- dialogGetActionArea,
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs.pp 111
+ dialogGetActionArea,
|
