|
From: Andy S. <And...@co...> - 2010-04-09 12:38:41
|
Fri Apr 9 08:36:44 EDT 2010 Andy Stewart <laz...@gm...>
* Add version tag in source code for old gtk+ library.
Ignore-this: 9b1c44b0a46fe9530b85f5150f48432a
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 248
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 251
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 282
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 284
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 2435
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 2449
+#endif
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 2670
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Abstract/Widget.chs.pp 2675
+#endif
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs.pp 158
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs.pp 160
+#endif
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs.pp 170
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs.pp 174
+#endif
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs.pp 571
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs.pp 580
+#endif
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs.pp 627
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.chs.pp 639
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/InfoBar.chs.pp 65
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Display/InfoBar.chs.pp 73
-#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Display/InfoBar.chs.pp 74
-#endif
hunk ./gtk/Graphics/UI/Gtk/Display/InfoBar.chs.pp 76
-#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Display/InfoBar.chs.pp 83
-#endif
hunk ./gtk/Graphics/UI/Gtk/Display/InfoBar.chs.pp 88
-#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Display/InfoBar.chs.pp 125
-#endif
hunk ./gtk/Graphics/UI/Gtk/Display/InfoBar.chs.pp 129
-#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Display/InfoBar.chs.pp 228
-#endif
hunk ./gtk/Graphics/UI/Gtk/Display/InfoBar.chs.pp 241
-#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Display/Label.chs.pp 203
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Display/Label.chs.pp 206
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/Label.chs.pp 1000
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Display/Label.chs.pp 1018
- [_$_]
+#endif [_$_]
+
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 131
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 135
+#endif
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 138
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 146
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 148
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 619
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 668
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 670
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 679
+#endif
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 735
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Display/StatusIcon.chs.pp 751
- [_$_]
+#endif [_$_]
+
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 154
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 157
+#endif
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 166
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 189
+ entryStateHint,
+#endif
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 193
+#endif
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 196
+#endif
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 216
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 218
- -- iconRelease,
+ iconRelease,
+#endif
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 1063
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 1085
+#endif
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 1157
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 1348
+-- | Indicates whether to pass a proper widget state when drawing the shadow and the widget background.
+-- [_$_]
+-- Default value: 'False'
+-- [_$_]
+-- Since 2.16
+entryStateHint :: EntryClass self => ReadAttr self Bool [_$_]
+entryStateHint = readAttrFromBoolProperty "state-hint"
+#endif
+
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 1366
+#endif
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 1368
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 1376
+#endif
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 1537
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 1541
- [_$_]
+
+-- | The 'iconRelease' signal is emitted when an activatable icon is clicked.
+iconRelease :: EntryClass self => Signal self (IconPosition -> Event -> IO ())
+iconRelease = Signal (connect_ENUM_BOXED__NONE "icon-release" marshalEvent)
+
+#endif [_$_]
+
hunk ./gtk/Graphics/UI/Gtk/Entry/Entry.chs.pp 1606
+
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs.pp 30
+ ArrowPlacement(..),
hunk ./gtk/Graphics/UI/Gtk/General/Enums.chs.pp 104
+-- | Used to specify the placement of scroll arrows in scrolling menus.
+{#enum ArrowPlacement {underscoreToCase} deriving (Bounded,Eq,Show)#}
+
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 94
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 96
+#endif
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 102
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 509
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 515
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 517
+#if GTK_CHECK_VERSION(2,14,0)
hunk ./gtk/Graphics/UI/Gtk/General/Selection.chs.pp 543
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ImageMenuItem.chs 73
+ imageMenuItemUseStock,
+ imageMenuItemAlwaysShowImage,
+ imageMenuItemAccelGroup,
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ImageMenuItem.chs 83
+import System.Glib.Properties
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/ImageMenuItem.chs 177
+
+-- | If 'True', the label set in the menuitem is used as a stock id to select the stock item for the item.
+-- [_$_]
+-- Default value: 'False'
+-- [_$_]
+-- Since 2.16
+imageMenuItemUseStock :: ImageMenuItemClass self => Attr self Bool
+imageMenuItemUseStock = newAttrFromBoolProperty "use-stock"
+
+-- | If 'True', the menu item will ignore the 'gtkMenuImages' setting and always show the image, if
+-- available.
+-- [_$_]
+-- Use this property if the menuitem would be useless or hard to use without the image.
+-- [_$_]
+-- Default value: 'False'
+-- [_$_]
+-- Since 2.16
+imageMenuItemAlwaysShowImage :: ImageMenuItemClass self => Attr self Bool
+imageMenuItemAlwaysShowImage = newAttrFromBoolProperty "always-show-image"
+
+-- | The Accel Group to use for stock accelerator keys
+-- [_$_]
+-- Since 2.16
+imageMenuItemAccelGroup :: ImageMenuItemClass self => WriteAttr self AccelGroup
+imageMenuItemAccelGroup = writeAttrFromObjectProperty "accel-group"
+ {# call pure unsafe gtk_accel_group_get_type #}
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 120
+#if GTK_CHECK_VERSION(2,16,0)
+ menuArrowPlacement,
+#endif
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 143
-import Graphics.UI.Gtk.General.Enums (ScrollType)
+import Graphics.UI.Gtk.General.Enums (ScrollType(..), ArrowPlacement(..))
hunk ./gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.chs.pp 471
+#if GTK_CHECK_VERSION(2,16,0)
+menuArrowPlacement :: MenuClass self => ReadAttr self ArrowPlacement [_$_]
+menuArrowPlacement = readAttrFromEnumProperty "arrow-placement"
+ {# call pure unsafe gtk_arrow_placement_get_type #}
+#endif
+
hunk ./gtk/Graphics/UI/Gtk/Misc/IMMulticontext.chs.pp 49
+#if GTK_CHECK_VERSION(2,16,0)
+ imMulticontextGetContextId,
+ imMulticontextSetContextId,
+#endif
hunk ./gtk/Graphics/UI/Gtk/Misc/IMMulticontext.chs.pp 58
+import System.Glib.UTFString
hunk ./gtk/Graphics/UI/Gtk/Misc/IMMulticontext.chs.pp 87
+
+#if GTK_CHECK_VERSION(2,16,0)
+imMulticontextGetContextId :: IMMulticontextClass self => self
+ -> IO String -- ^ returns the id of the currently active slave
+imMulticontextGetContextId self =
+ {# call gtk_im_multicontext_get_context_id #}
+ (toIMMulticontext self)
+ >>= peekUTFString
+
+imMulticontextSetContextId :: IMMulticontextClass self => self
+ -> String -- ^ @contextId@ - the id to use
+ -> IO ()
+imMulticontextSetContextId self contextId =
+ withUTFString contextId $ \contextIdPtr ->
+ {# call gtk_im_multicontext_set_context_id #}
+ (toIMMulticontext self)
+ contextIdPtr
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRendererToggle.chs.pp 60
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRendererToggle.chs.pp 63
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRendererToggle.chs.pp 144
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/ModelView/CellRendererToggle.chs.pp 166
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs.pp 139
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs.pp 141
+#endif
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs.pp 905
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/ModelView/TreeViewColumn.chs.pp 913
+#endif
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 189
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 191
+#endif
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 1499
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 1502
+#endif
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextView.chs.pp 141
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextView.chs.pp 143
+#endif
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextView.chs.pp 1100
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextView.chs.pp 1110
+#endif
hunk ./gtk/Graphics/UI/Gtk/Printing/PrintOperation.chs.pp 136
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Printing/PrintOperation.chs.pp 141
+#endif
hunk ./gtk/Graphics/UI/Gtk/Printing/PrintOperation.chs.pp 663
+#if GTK_CHECK_VERSION(2,18,0)
hunk ./gtk/Graphics/UI/Gtk/Printing/PrintOperation.chs.pp 705
+#endif
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs.pp 132
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs.pp 134
+#endif
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs.pp 402
+#if GTK_CHECK_VERSION(2,16,0)
hunk ./gtk/Graphics/UI/Gtk/Windows/Dialog.chs.pp 414
+#endif
|