gtkmm r1079 - in trunk: . gtk/src



Author: murrayc
Date: Mon Jan 19 11:28:46 2009
New Revision: 1079
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1079&view=rev

Log:
2009-01-19  Murray Cumming  <murrayc murrayc com>

* gtk/src/gtk_methods.defs:
* gtk/src/gtk_signals.defs: Regenerated.
* gtk/src/entry.hg: Renamed methods and adapted to requested GTK+ 
API changes in #567887.

* gtk/src/imagemenuitem.hg: Fixed a typo in the accel_group property 
wrap, to fix the build.
* gtk/src/selectiondata.hg: Reimplement get_selection() using the 
new C getter method.
* gtk/src/statusicon.hg: Added button_press_event, 
button_release_event and scroll_event signals.
* gtk/src/textbuffer.hg: Added the paste_done signal.

Modified:
   trunk/ChangeLog
   trunk/gtk/src/entry.hg
   trunk/gtk/src/gtk_methods.defs
   trunk/gtk/src/gtk_signals.defs
   trunk/gtk/src/imagemenuitem.hg
   trunk/gtk/src/selectiondata.hg
   trunk/gtk/src/statusicon.hg
   trunk/gtk/src/textbuffer.hg

Modified: trunk/gtk/src/entry.hg
==============================================================================
--- trunk/gtk/src/entry.hg	(original)
+++ trunk/gtk/src/entry.hg	Mon Jan 19 11:28:46 2009
@@ -119,20 +119,22 @@
   _WRAP_METHOD(void set_icon_from_icon_name(EntryIconPosition icon_pos,
 							  const Glib::ustring& icon_name), gtk_entry_set_icon_from_icon_name)
   _WRAP_METHOD(void set_icon_from_gicon(EntryIconPosition icon_pos, const Glib::RefPtr<Gio::Icon>& icon), gtk_entry_set_icon_from_gicon)
-  _WRAP_METHOD(ImageType get_storage_type(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_storage_type)
-  _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_pixbuf(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY), gtk_entry_get_pixbuf, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_pixbuf(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_pixbuf, refreturn, constversion)
-  _WRAP_METHOD(StockID get_stock(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_stock)
+  _WRAP_METHOD(ImageType get_icon_storage_type(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_storage_type)
+  _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_icon_pixbuf(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY), gtk_entry_get_icon_pixbuf, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_icon_pixbuf(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_pixbuf, refreturn, constversion)
+  _WRAP_METHOD(StockID get_icon_stock(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_stock)
   _WRAP_METHOD(Glib::ustring get_icon_name(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_name)
-  _WRAP_METHOD(Glib::RefPtr<Gio::Icon> get_gicon(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY), gtk_entry_get_gicon, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Gio::Icon> get_gicon(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_gicon, refreturn, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Gio::Icon> get_icon_gicon(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY), gtk_entry_get_icon_gicon, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Gio::Icon> get_icon_gicon(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_gicon, refreturn, constversion)
   _WRAP_METHOD(void set_icon_activatable(EntryIconPosition icon_pos, bool activatable), gtk_entry_set_icon_activatable)
   _WRAP_METHOD(bool get_icon_activatable(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_activatable)
   _WRAP_METHOD(void set_icon_sensitive(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY, bool sensitive = true), gtk_entry_set_icon_sensitive)
   _WRAP_METHOD(bool get_icon_sensitive(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY), gtk_entry_get_icon_sensitive)
-  _WRAP_METHOD(int get_icon_at_pos(int x, int y), gtk_entry_get_icon_at_pos)
+  _WRAP_METHOD(int get_icon_at_pos(int x, int y) const, gtk_entry_get_icon_at_pos)
   _WRAP_METHOD(void set_icon_tooltip_text(EntryIconPosition icon_pos, const Glib::ustring& tooltip), gtk_entry_set_icon_tooltip_text)
+  _WRAP_METHOD(Glib::ustring get_icon_tooltip_text(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_tooltip_text)
   _WRAP_METHOD(void set_icon_tooltip_markup(EntryIconPosition icon_pos, const Glib::ustring& tooltip), gtk_entry_set_icon_tooltip_markup)
+  _WRAP_METHOD(Glib::ustring get_icon_tooltip_markup(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_tooltip_markup)
   _WRAP_METHOD(void set_icon_drag_source(EntryIconPosition icon_pos, const Glib::RefPtr<TargetList>& target_list, Gdk::DragAction actions = Gdk::ACTION_COPY), gtk_entry_set_icon_drag_source)
   _WRAP_METHOD(int get_current_icon_drag_source(), gtk_entry_get_current_icon_drag_source)
 
@@ -156,6 +158,8 @@
   _IGNORE_SIGNAL("toggle_overwrite")
   _IGNORE_SIGNAL("backspace")
 
+  //TODO: Wrap the icon-release and icon-press signals? Or are they just useless activate signals? murrayc.
+
   _WRAP_PROPERTY("cursor-position", int)
   _WRAP_PROPERTY("selection-bound", int)
   _WRAP_PROPERTY("editable", bool)
@@ -176,20 +180,20 @@
   _WRAP_PROPERTY("caps-lock-warning", bool)
   _WRAP_PROPERTY("progress-fraction", double)
   _WRAP_PROPERTY("progress-pulse-step", double)
-  _WRAP_PROPERTY("pixbuf-primary", Glib::RefPtr<Gdk::Pixbuf>)
-  _WRAP_PROPERTY("pixbuf-secondary", Glib::RefPtr<Gdk::Pixbuf>)
-  _WRAP_PROPERTY("stock-primary", StockID)
-  _WRAP_PROPERTY("stock-secondary", StockID)
-  _WRAP_PROPERTY("icon-name-primary", Glib::ustring)
-  _WRAP_PROPERTY("icon-name-secondary", Glib::ustring)
-  _WRAP_PROPERTY("gicon-primary", Glib::RefPtr<Gio::Icon>)
-  _WRAP_PROPERTY("gicon-secondary", Glib::RefPtr<Gio::Icon>)
-  _WRAP_PROPERTY("storage-type-primary", ImageType)
-  _WRAP_PROPERTY("storage-type-secondary", ImageType)
-  _WRAP_PROPERTY("activatable-primary", bool)
-  _WRAP_PROPERTY("activatable-secondary", bool)
-  _WRAP_PROPERTY("sensitive-primary", bool)
-  _WRAP_PROPERTY("sensitive-secondary", bool)
+  _WRAP_PROPERTY("primary-icon-pixbuf", Glib::RefPtr<Gdk::Pixbuf>)
+  _WRAP_PROPERTY("secondary-icon-pixbuf", Glib::RefPtr<Gdk::Pixbuf>)
+  _WRAP_PROPERTY("primary-icon-stock", StockID)
+  _WRAP_PROPERTY("secondary-icon-stock", StockID)
+  _WRAP_PROPERTY("primary-icon-name", Glib::ustring)
+  _WRAP_PROPERTY("secondary-icon-name", Glib::ustring)
+  _WRAP_PROPERTY("primary-icon-gicon", Glib::RefPtr<Gio::Icon>)
+  _WRAP_PROPERTY("secondary-icon-gicon", Glib::RefPtr<Gio::Icon>)
+  _WRAP_PROPERTY("primary-icon-storage-type", ImageType)
+  _WRAP_PROPERTY("secondary-icon-storage-type", ImageType)
+  _WRAP_PROPERTY("primary-icon-activatable", bool)
+  _WRAP_PROPERTY("secondary-icon-activatable", bool)
+  _WRAP_PROPERTY("primary-icon-sensitive", bool)
+  _WRAP_PROPERTY("secondary-icon-sensitive", bool)
   _WRAP_PROPERTY("im-module", Glib::ustring)
 };
 

Modified: trunk/gtk/src/gtk_methods.defs
==============================================================================
--- trunk/gtk/src/gtk_methods.defs	(original)
+++ trunk/gtk/src/gtk_methods.defs	Mon Jan 19 11:28:46 2009
@@ -9970,27 +9970,27 @@
   )
 )
 
-(define-method get_storage_type
+(define-method get_icon_storage_type
   (of-object "GtkEntry")
-  (c-name "gtk_entry_get_storage_type")
+  (c-name "gtk_entry_get_icon_storage_type")
   (return-type "GtkImageType")
   (parameters
     '("GtkEntryIconPosition" "icon_pos")
   )
 )
 
-(define-method get_pixbuf
+(define-method get_icon_pixbuf
   (of-object "GtkEntry")
-  (c-name "gtk_entry_get_pixbuf")
+  (c-name "gtk_entry_get_icon_pixbuf")
   (return-type "GdkPixbuf*")
   (parameters
     '("GtkEntryIconPosition" "icon_pos")
   )
 )
 
-(define-method get_stock
+(define-method get_icon_stock
   (of-object "GtkEntry")
-  (c-name "gtk_entry_get_stock")
+  (c-name "gtk_entry_get_icon_stock")
   (return-type "const-gchar*")
   (parameters
     '("GtkEntryIconPosition" "icon_pos")
@@ -10006,9 +10006,9 @@
   )
 )
 
-(define-method get_gicon
+(define-method get_icon_gicon
   (of-object "GtkEntry")
-  (c-name "gtk_entry_get_gicon")
+  (c-name "gtk_entry_get_icon_gicon")
   (return-type "GIcon*")
   (parameters
     '("GtkEntryIconPosition" "icon_pos")
@@ -10073,6 +10073,15 @@
   )
 )
 
+(define-method get_icon_tooltip_text
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_icon_tooltip_text")
+  (return-type "gchar*")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+  )
+)
+
 (define-method set_icon_tooltip_markup
   (of-object "GtkEntry")
   (c-name "gtk_entry_set_icon_tooltip_markup")
@@ -10083,6 +10092,15 @@
   )
 )
 
+(define-method get_icon_tooltip_markup
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_icon_tooltip_markup")
+  (return-type "gchar*")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+  )
+)
+
 (define-method set_icon_drag_source
   (of-object "GtkEntry")
   (c-name "gtk_entry_set_icon_drag_source")
@@ -22717,7 +22735,7 @@
   (c-name "gtk_status_icon_set_tooltip_text")
   (return-type "none")
   (parameters
-    '("const-char*" "text")
+    '("const-gchar*" "text")
   )
 )
 
@@ -22726,7 +22744,7 @@
   (c-name "gtk_status_icon_set_tooltip_markup")
   (return-type "none")
   (parameters
-    '("const-char*" "markup")
+    '("const-gchar*" "markup")
   )
 )
 

Modified: trunk/gtk/src/gtk_signals.defs
==============================================================================
--- trunk/gtk/src/gtk_signals.defs	(original)
+++ trunk/gtk/src/gtk_signals.defs	Mon Jan 19 11:28:46 2009
@@ -13000,7 +13000,7 @@
   (construct-only #f)
 )
 
-(define-property pixbuf-primary
+(define-property primary-icon-pixbuf
   (of-object "GtkEntry")
   (prop-type "GParamObject")
   (docs "Primary pixbuf for the entry")
@@ -13009,7 +13009,7 @@
   (construct-only #f)
 )
 
-(define-property pixbuf-secondary
+(define-property secondary-icon-pixbuf
   (of-object "GtkEntry")
   (prop-type "GParamObject")
   (docs "Secondary pixbuf for the entry")
@@ -13018,7 +13018,7 @@
   (construct-only #f)
 )
 
-(define-property stock-primary
+(define-property primary-icon-stock
   (of-object "GtkEntry")
   (prop-type "GParamString")
   (docs "Stock ID for primary icon")
@@ -13027,7 +13027,7 @@
   (construct-only #f)
 )
 
-(define-property stock-secondary
+(define-property secondary-icon-stock
   (of-object "GtkEntry")
   (prop-type "GParamString")
   (docs "Stock ID for secondary icon")
@@ -13036,7 +13036,7 @@
   (construct-only #f)
 )
 
-(define-property icon-name-primary
+(define-property primary-icon-name
   (of-object "GtkEntry")
   (prop-type "GParamString")
   (docs "Icon name for primary icon")
@@ -13045,7 +13045,7 @@
   (construct-only #f)
 )
 
-(define-property icon-name-secondary
+(define-property secondary-icon-name
   (of-object "GtkEntry")
   (prop-type "GParamString")
   (docs "Icon name for secondary icon")
@@ -13054,7 +13054,7 @@
   (construct-only #f)
 )
 
-(define-property gicon-primary
+(define-property primary-icon-gicon
   (of-object "GtkEntry")
   (prop-type "GParamObject")
   (docs "GIcon for primary icon")
@@ -13063,7 +13063,7 @@
   (construct-only #f)
 )
 
-(define-property gicon-secondary
+(define-property secondary-icon-gicon
   (of-object "GtkEntry")
   (prop-type "GParamObject")
   (docs "GIcon for secondary icon")
@@ -13072,7 +13072,7 @@
   (construct-only #f)
 )
 
-(define-property storage-type-primary
+(define-property primary-icon-storage-type
   (of-object "GtkEntry")
   (prop-type "GParamEnum")
   (docs "The representation being used for primary icon")
@@ -13081,7 +13081,7 @@
   (construct-only #f)
 )
 
-(define-property storage-type-secondary
+(define-property secondary-icon-storage-type
   (of-object "GtkEntry")
   (prop-type "GParamEnum")
   (docs "The representation being used for secondary icon")
@@ -13090,7 +13090,7 @@
   (construct-only #f)
 )
 
-(define-property activatable-primary
+(define-property primary-icon-activatable
   (of-object "GtkEntry")
   (prop-type "GParamBoolean")
   (docs "Whether the primary icon is activatable")
@@ -13099,7 +13099,7 @@
   (construct-only #f)
 )
 
-(define-property activatable-secondary
+(define-property secondary-icon-activatable
   (of-object "GtkEntry")
   (prop-type "GParamBoolean")
   (docs "Whether the secondary icon is activatable")
@@ -13108,7 +13108,7 @@
   (construct-only #f)
 )
 
-(define-property sensitive-primary
+(define-property primary-icon-sensitive
   (of-object "GtkEntry")
   (prop-type "GParamBoolean")
   (docs "Whether the primary icon is sensitive")
@@ -13117,7 +13117,7 @@
   (construct-only #f)
 )
 
-(define-property sensitive-secondary
+(define-property secondary-icon-sensitive
   (of-object "GtkEntry")
   (prop-type "GParamBoolean")
   (docs "Whether the secondary icon is sensitive")
@@ -13126,6 +13126,42 @@
   (construct-only #f)
 )
 
+(define-property primary-icon-tooltip-text
+  (of-object "GtkEntry")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip on the primary icon")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property secondary-icon-tooltip-text
+  (of-object "GtkEntry")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip on the secondary icon")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property primary-icon-tooltip-markup
+  (of-object "GtkEntry")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip on the primary icon")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property secondary-icon-tooltip-markup
+  (of-object "GtkEntry")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip on the secondary icon")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property im-module
   (of-object "GtkEntry")
   (prop-type "GParamString")
@@ -13816,28 +13852,28 @@
   (when "first")
 )
 
-(define-property extra-widget
+(define-property select-multiple
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for extra options.")
+  (prop-type "GParamBoolean")
+  (docs "Whether to allow multiple files to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget-active
+(define-property local-only
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
-  (docs "Whether the application supplied widget for custom previews should be shown.")
+  (docs "Whether the selected file(s) should be limited to local file: URLs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property orientation
+(define-property use-preview-label
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamEnum")
-  (docs "The orientation of the orientable")
+  (prop-type "GParamBoolean")
+  (docs "Whether to display a stock label with the name of the previewed file.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -13852,28 +13888,19 @@
   (construct-only #t)
 )
 
-(define-property preview-widget
-  (of-object "GtkFileChooserButton")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for custom previews.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property local-only
+(define-property do-overwrite-confirmation
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected file(s) should be limited to local file: URLs")
+  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-preview-label
+(define-property preview-widget
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to display a stock label with the name of the previewed file.")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for custom previews.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -13888,19 +13915,19 @@
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property preview-widget-active
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (docs "Whether the application supplied widget for custom previews should be shown.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property do-overwrite-confirmation
+(define-property extra-widget
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for extra options.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -13915,6 +13942,15 @@
   (construct-only #f)
 )
 
+(define-property orientation
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property show-hidden
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
@@ -14214,19 +14250,28 @@
 
 ;; From GtkFileChooserDialog
 
-(define-property extra-widget
+(define-property select-multiple
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for extra options.")
+  (prop-type "GParamBoolean")
+  (docs "Whether to allow multiple files to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget-active
+(define-property local-only
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether the application supplied widget for custom previews should be shown.")
+  (docs "Whether the selected file(s) should be limited to local file: URLs")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-preview-label
+  (of-object "GtkFileChooserDialog")
+  (prop-type "GParamBoolean")
+  (docs "Whether to display a stock label with the name of the previewed file.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14241,28 +14286,19 @@
   (construct-only #t)
 )
 
-(define-property preview-widget
-  (of-object "GtkFileChooserDialog")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for custom previews.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property local-only
+(define-property do-overwrite-confirmation
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected file(s) should be limited to local file: URLs")
+  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-preview-label
+(define-property preview-widget
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether to display a stock label with the name of the previewed file.")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for custom previews.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14277,19 +14313,19 @@
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property preview-widget-active
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (docs "Whether the application supplied widget for custom previews should be shown.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property do-overwrite-confirmation
+(define-property extra-widget
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for extra options.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14810,28 +14846,28 @@
 
 ;; From GtkFileChooserWidget
 
-(define-property extra-widget
+(define-property select-multiple
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for extra options.")
+  (prop-type "GParamBoolean")
+  (docs "Whether to allow multiple files to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget-active
+(define-property local-only
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether the application supplied widget for custom previews should be shown.")
+  (docs "Whether the selected file(s) should be limited to local file: URLs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property orientation
+(define-property use-preview-label
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamEnum")
-  (docs "The orientation of the orientable")
+  (prop-type "GParamBoolean")
+  (docs "Whether to display a stock label with the name of the previewed file.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14846,28 +14882,19 @@
   (construct-only #t)
 )
 
-(define-property preview-widget
-  (of-object "GtkFileChooserWidget")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for custom previews.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property local-only
+(define-property do-overwrite-confirmation
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected file(s) should be limited to local file: URLs")
+  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-preview-label
+(define-property preview-widget
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether to display a stock label with the name of the previewed file.")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for custom previews.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14882,19 +14909,19 @@
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property preview-widget-active
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (docs "Whether the application supplied widget for custom previews should be shown.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property do-overwrite-confirmation
+(define-property extra-widget
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for extra options.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14909,6 +14936,15 @@
   (construct-only #f)
 )
 
+(define-property orientation
+  (of-object "GtkFileChooserWidget")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property show-hidden
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
@@ -18056,8 +18092,316 @@
 (define-property gicon
   (of-object "GtkImage")
   (prop-type "GParamObject")
-  (docs "The GIcon being displayed")
-  (readable #t)
+  (docs "The GIcon being displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GtkImageMenuItem
+
+(define-property user-data
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamPointer")
+  (docs "Anonymous User Data Pointer")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property name
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamString")
+  (docs "The name of the widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property parent
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamObject")
+  (docs "The parent widget of this widget. Must be a Container widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property width-request
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamInt")
+  (docs "Override for width request of the widget, or -1 if natural request should be used")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property height-request
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamInt")
+  (docs "Override for height request of the widget, or -1 if natural request should be used")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property visible
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is visible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sensitive
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget responds to input")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property app-paintable
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether the application will paint directly on the widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property can-focus
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget can accept the input focus")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property has-focus
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget has the input focus")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property is-focus
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is the focus widget within the toplevel")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property can-default
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget can be the default widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property has-default
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is the default widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property receives-default
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "If TRUE, the widget will receive the default action when it is focused")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property composite-child
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is part of a composite widget")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property style
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamObject")
+  (docs "The style of the widget, which contains information about how it will look (colors etc)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property events
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamFlags")
+  (docs "The event mask that decides what kind of GdkEvents this widget gets")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property extension-events
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamEnum")
+  (docs "The mask that decides what kind of extension events this widget gets")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property no-show-all
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether gtk_widget_show_all() should not affect this widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property has-tooltip
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether this widget has a tooltip")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property tooltip-markup
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip for this widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property tooltip-text
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip for this widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property window
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property border-width
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamUInt")
+  (docs "The width of the empty border outside the containers children")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property resize-mode
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamEnum")
+  (docs "Specify how resize events are handled")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property child
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamObject")
+  (docs "Can be used to add a new child to the container")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property right-justified
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Sets whether the menu item appears justified at the right side of a menu bar")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property submenu
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamObject")
+  (docs "The submenu attached to the menu item, or NULL if it has none")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property accel-path
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamString")
+  (docs "Sets the accelerator path of the menu item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property label
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamString")
+  (docs "The text for the child label")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-underline
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property image
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamObject")
+  (docs "Child widget to appear next to the menu text")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-stock
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the label text to create a stock menu item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property accel-group
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamObject")
+  (docs "The Accel Group to use for stock accelerator keys")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
@@ -29067,91 +29411,91 @@
 
 ;; From GtkRecentAction
 
-(define-property show-private
+(define-property local-only
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether the private items should be displayed")
+  (docs "Whether the selected resource(s) should be limited to local file: URIs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property filter
+(define-property limit
   (of-object "GtkRecentAction")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which resources are displayed")
+  (prop-type "GParamInt")
+  (docs "The maximum number of items to be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-not-found
+(define-property show-tips
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (docs "Whether there should be a tooltip on the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property recent-manager
+(define-property filter
   (of-object "GtkRecentAction")
   (prop-type "GParamObject")
-  (docs "The RecentManager object to use")
-  (readable #f)
+  (docs "The current filter for selecting which resources are displayed")
+  (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property show-icons
+(define-property select-multiple
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether there should be an icon near the item")
+  (docs "Whether to allow multiple items to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property sort-type
+(define-property recent-manager
   (of-object "GtkRecentAction")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
-  (readable #t)
+  (prop-type "GParamObject")
+  (docs "The RecentManager object to use")
+  (readable #f)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-(define-property local-only
+(define-property show-private
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected resource(s) should be limited to local file: URIs")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property limit
+(define-property show-not-found
   (of-object "GtkRecentAction")
-  (prop-type "GParamInt")
-  (docs "The maximum number of items to be displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether the items pointing to unavailable resources should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property show-icons
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
+  (docs "Whether there should be an icon near the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-tips
+(define-property sort-type
   (of-object "GtkRecentAction")
-  (prop-type "GParamBoolean")
-  (docs "Whether there should be a tooltip on the item")
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29315,10 +29659,28 @@
   (when "last")
 )
 
-(define-property show-private
+(define-property local-only
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether the private items should be displayed")
+  (docs "Whether the selected resource(s) should be limited to local file: URIs")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property limit
+  (of-object "GtkRecentChooser")
+  (prop-type "GParamInt")
+  (docs "The maximum number of items to be displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property show-tips
+  (of-object "GtkRecentChooser")
+  (prop-type "GParamBoolean")
+  (docs "Whether there should be a tooltip on the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29333,10 +29695,10 @@
   (construct-only #f)
 )
 
-(define-property show-not-found
+(define-property select-multiple
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (docs "Whether to allow multiple items to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29351,66 +29713,66 @@
   (construct-only #t)
 )
 
-(define-property show-icons
+(define-property show-private
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether there should be an icon near the item")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property sort-type
+(define-property show-not-found
   (of-object "GtkRecentChooser")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether the items pointing to unavailable resources should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property local-only
+(define-property show-icons
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected resource(s) should be limited to local file: URIs")
+  (docs "Whether there should be an icon near the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property limit
+(define-property sort-type
   (of-object "GtkRecentChooser")
-  (prop-type "GParamInt")
-  (docs "The maximum number of items to be displayed")
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property select-multiple
-  (of-object "GtkRecentChooser")
+;; From GtkRecentChooserMenu
+
+(define-property local-only
+  (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
+  (docs "Whether the selected resource(s) should be limited to local file: URIs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-tips
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamBoolean")
-  (docs "Whether there should be a tooltip on the item")
+(define-property limit
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamInt")
+  (docs "The maximum number of items to be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GtkRecentChooserMenu
-
-(define-property show-private
+(define-property show-tips
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether the private items should be displayed")
+  (docs "Whether there should be a tooltip on the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29425,10 +29787,10 @@
   (construct-only #f)
 )
 
-(define-property show-not-found
+(define-property select-multiple
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (docs "Whether to allow multiple items to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29443,55 +29805,37 @@
   (construct-only #t)
 )
 
-(define-property show-icons
+(define-property show-private
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether there should be an icon near the item")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sort-type
-  (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property local-only
+(define-property show-not-found
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected resource(s) should be limited to local file: URIs")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property limit
-  (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamInt")
-  (docs "The maximum number of items to be displayed")
+  (docs "Whether the items pointing to unavailable resources should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property show-icons
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
+  (docs "Whether there should be an icon near the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-tips
+(define-property sort-type
   (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamBoolean")
-  (docs "Whether there should be a tooltip on the item")
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29814,19 +30158,19 @@
 
 ;; From GtkRecentChooserWidget
 
-(define-property recent-manager
+(define-property sort-type
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamObject")
-  (docs "The RecentManager object to use")
-  (readable #f)
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
+  (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property show-not-found
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
+  (docs "Whether the items pointing to unavailable resources should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29841,19 +30185,28 @@
   (construct-only #f)
 )
 
-(define-property show-not-found
+(define-property recent-manager
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (prop-type "GParamObject")
+  (docs "The RecentManager object to use")
+  (readable #f)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property filter
+  (of-object "GtkRecentChooserWidget")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which resources are displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-private
+(define-property show-tips
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether the private items should be displayed")
+  (docs "Whether there should be a tooltip on the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29877,15 +30230,6 @@
   (construct-only #f)
 )
 
-(define-property show-tips
-  (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether there should be a tooltip on the item")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property show-icons
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
@@ -29895,19 +30239,19 @@
   (construct-only #f)
 )
 
-(define-property sort-type
+(define-property show-private
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property filter
+(define-property select-multiple
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which resources are displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether to allow multiple items to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -33507,7 +33851,7 @@
   (construct-only #f)
 )
 
-(define-property pixbuf-primary
+(define-property primary-icon-pixbuf
   (of-object "GtkSpinButton")
   (prop-type "GParamObject")
   (docs "Primary pixbuf for the entry")
@@ -33516,7 +33860,7 @@
   (construct-only #f)
 )
 
-(define-property pixbuf-secondary
+(define-property secondary-icon-pixbuf
   (of-object "GtkSpinButton")
   (prop-type "GParamObject")
   (docs "Secondary pixbuf for the entry")
@@ -33525,7 +33869,7 @@
   (construct-only #f)
 )
 
-(define-property stock-primary
+(define-property primary-icon-stock
   (of-object "GtkSpinButton")
   (prop-type "GParamString")
   (docs "Stock ID for primary icon")
@@ -33534,7 +33878,7 @@
   (construct-only #f)
 )
 
-(define-property stock-secondary
+(define-property secondary-icon-stock
   (of-object "GtkSpinButton")
   (prop-type "GParamString")
   (docs "Stock ID for secondary icon")
@@ -33543,7 +33887,7 @@
   (construct-only #f)
 )
 
-(define-property icon-name-primary
+(define-property primary-icon-name
   (of-object "GtkSpinButton")
   (prop-type "GParamString")
   (docs "Icon name for primary icon")
@@ -33552,7 +33896,7 @@
   (construct-only #f)
 )
 
-(define-property icon-name-secondary
+(define-property secondary-icon-name
   (of-object "GtkSpinButton")
   (prop-type "GParamString")
   (docs "Icon name for secondary icon")
@@ -33561,7 +33905,7 @@
   (construct-only #f)
 )
 
-(define-property gicon-primary
+(define-property primary-icon-gicon
   (of-object "GtkSpinButton")
   (prop-type "GParamObject")
   (docs "GIcon for primary icon")
@@ -33570,7 +33914,7 @@
   (construct-only #f)
 )
 
-(define-property gicon-secondary
+(define-property secondary-icon-gicon
   (of-object "GtkSpinButton")
   (prop-type "GParamObject")
   (docs "GIcon for secondary icon")
@@ -33579,7 +33923,7 @@
   (construct-only #f)
 )
 
-(define-property storage-type-primary
+(define-property primary-icon-storage-type
   (of-object "GtkSpinButton")
   (prop-type "GParamEnum")
   (docs "The representation being used for primary icon")
@@ -33588,7 +33932,7 @@
   (construct-only #f)
 )
 
-(define-property storage-type-secondary
+(define-property secondary-icon-storage-type
   (of-object "GtkSpinButton")
   (prop-type "GParamEnum")
   (docs "The representation being used for secondary icon")
@@ -33597,7 +33941,7 @@
   (construct-only #f)
 )
 
-(define-property activatable-primary
+(define-property primary-icon-activatable
   (of-object "GtkSpinButton")
   (prop-type "GParamBoolean")
   (docs "Whether the primary icon is activatable")
@@ -33606,7 +33950,7 @@
   (construct-only #f)
 )
 
-(define-property activatable-secondary
+(define-property secondary-icon-activatable
   (of-object "GtkSpinButton")
   (prop-type "GParamBoolean")
   (docs "Whether the secondary icon is activatable")
@@ -33615,7 +33959,7 @@
   (construct-only #f)
 )
 
-(define-property sensitive-primary
+(define-property primary-icon-sensitive
   (of-object "GtkSpinButton")
   (prop-type "GParamBoolean")
   (docs "Whether the primary icon is sensitive")
@@ -33624,7 +33968,7 @@
   (construct-only #f)
 )
 
-(define-property sensitive-secondary
+(define-property secondary-icon-sensitive
   (of-object "GtkSpinButton")
   (prop-type "GParamBoolean")
   (docs "Whether the secondary icon is sensitive")
@@ -33633,6 +33977,42 @@
   (construct-only #f)
 )
 
+(define-property primary-icon-tooltip-text
+  (of-object "GtkSpinButton")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip on the primary icon")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property secondary-icon-tooltip-text
+  (of-object "GtkSpinButton")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip on the secondary icon")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property primary-icon-tooltip-markup
+  (of-object "GtkSpinButton")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip on the primary icon")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property secondary-icon-tooltip-markup
+  (of-object "GtkSpinButton")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip on the secondary icon")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property im-module
   (of-object "GtkSpinButton")
   (prop-type "GParamString")
@@ -34022,7 +34402,7 @@
   (return-type "gboolean")
   (when "last")
   (parameters
-    '("GdkEvent*" "p0")
+    '("GdkEventButton*" "p0")
   )
 )
 
@@ -34031,7 +34411,7 @@
   (return-type "gboolean")
   (when "last")
   (parameters
-    '("GdkEvent*" "p0")
+    '("GdkEventButton*" "p0")
   )
 )
 
@@ -34040,7 +34420,7 @@
   (return-type "gboolean")
   (when "last")
   (parameters
-    '("GdkEvent*" "p0")
+    '("GdkEventScroll*" "p0")
   )
 )
 

Modified: trunk/gtk/src/imagemenuitem.hg
==============================================================================
--- trunk/gtk/src/imagemenuitem.hg	(original)
+++ trunk/gtk/src/imagemenuitem.hg	Mon Jan 19 11:28:46 2009
@@ -58,7 +58,7 @@
 
   _WRAP_PROPERTY("image", Widget*)
   _WRAP_PROPERTY("use-stock", bool)
-  _WRAP_PROPERTY("accel-group", Glib::RefPtr<AcceGroup>)
+  _WRAP_PROPERTY("accel-group", Glib::RefPtr<AccelGroup>)
 
 };
 

Modified: trunk/gtk/src/selectiondata.hg
==============================================================================
--- trunk/gtk/src/selectiondata.hg	(original)
+++ trunk/gtk/src/selectiondata.hg	Mon Jan 19 11:28:46 2009
@@ -91,9 +91,12 @@
 
   std::string get_data_as_string() const;
 
+  //TODO: Change the return type to std::string, when we can break ABI:
+  _WRAP_METHOD(GdkAtom get_selection() const, gtk_selection_data_get_selection)
+
   /** Retrieves the target of the selection.
    *
-   * Since: 2.14
+   * @newin2p14
    **/
   std::string get_target() const;
   _IGNORE(gtk_selection_data_get_target)
@@ -102,10 +105,6 @@
   Gdk::ArrayHandle_AtomString get_targets() const;
   _IGNORE(gtk_selection_data_get_targets)
 
-  /** Returns the ID of the selection.
-   */
-  _MEMBER_GET(selection, selection, GdkAtom, GdkAtom)
-
   /** Returns the type of the data as set by SelectionData::set().
    */
   std::string get_data_type() const; // get_type() already exists

Modified: trunk/gtk/src/statusicon.hg
==============================================================================
--- trunk/gtk/src/statusicon.hg	(original)
+++ trunk/gtk/src/statusicon.hg	Mon Jan 19 11:28:46 2009
@@ -181,6 +181,9 @@
   //TODO: Remove no_default_handler when we can break ABI.
   _WRAP_SIGNAL(void activate(), activate, no_default_handler)
   _WRAP_SIGNAL(void popup_menu(guint button, guint32 activate_time), popup_menu, no_default_handler)
+  _WRAP_SIGNAL(bool button_press_event(GdkEventButton* event), button_press_event, no_default_handler)
+  _WRAP_SIGNAL(bool button_release_event(GdkEventButton* event), button_release_event, no_default_handler)
+  _WRAP_SIGNAL(bool scroll_event(GdkEventScroll* event), scroll_event, no_default_handler)
 };
 
 } // namespace Gtk

Modified: trunk/gtk/src/textbuffer.hg
==============================================================================
--- trunk/gtk/src/textbuffer.hg	(original)
+++ trunk/gtk/src/textbuffer.hg	Mon Jan 19 11:28:46 2009
@@ -597,6 +597,10 @@
   _WRAP_SIGNAL(void begin_user_action(), "begin_user_action")
   _WRAP_SIGNAL(void end_user_action(), "end_user_action")
 
+  //TODO: Remove no_default_handler when we can break ABI:
+#m4 _CONVERSION(`GtkClipboard*',`const Glib::RefPtr<Gtk::Clipboard>&', Glib::wrap($3, true))
+  _WRAP_SIGNAL(void paste_done(const Glib::RefPtr<Gtk::Clipboard>& clipboard), "paste_done", no_default_handler)
+
   _WRAP_PROPERTY("text", Glib::ustring)
   _WRAP_PROPERTY("has-selection", bool)
   _WRAP_PROPERTY("cursor-position", int)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]