gtkmm r1024 - in trunk: . gtk/src tools/m4



Author: murrayc
Date: Thu Aug  7 15:23:26 2008
New Revision: 1024
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1024&view=rev

Log:
2008-08-07  Murray Cumming  <murrayc murrayc com>

* gtk/src/gtk_methods.defs: Regenerated.
* gtk/src/gtk_signals.defs: Regenerated.

* gtk/src/adjustment.ccg:
* gtk/src/adjustment.hg: Reimplemented some MEMBER_GET and set 
functions with _WRAP_METHOD() now that there are C functions.
* gtk/src/combobox.hg: Added get/set_button_sensitivity().
* gtk/src/range.hg:
* gtk/src/enums.hg: Moved SensitivityType here because it is 
used in ComboBox too.
* gtk/src/filechooser.hg: Added set_file(), select_file(), unselect_file(), 
taking a Gio::File. Added get_files(), set_current_folder_file(), 
get_current_folder_file(), get_file(), gtk_file_chooser_get_file()
get_file(), get_preview_file().
* gtk/src/statusicon.ccg:
* gtk/src/statusicon.hg: Added set() taking a Gio::Icon. Added get_icon() 
and gicon property. Added constructor taking a Gio::Icon.
* tools/m4/convert_gtk.m4: Added necessary conversions.

Modified:
   trunk/ChangeLog
   trunk/gtk/src/adjustment.ccg
   trunk/gtk/src/adjustment.hg
   trunk/gtk/src/combobox.hg
   trunk/gtk/src/enums.hg
   trunk/gtk/src/filechooser.hg
   trunk/gtk/src/gtk_methods.defs
   trunk/gtk/src/gtk_signals.defs
   trunk/gtk/src/range.hg
   trunk/gtk/src/statusicon.ccg
   trunk/gtk/src/statusicon.hg
   trunk/tools/m4/convert_gtk.m4

Modified: trunk/gtk/src/adjustment.ccg
==============================================================================
--- trunk/gtk/src/adjustment.ccg	(original)
+++ trunk/gtk/src/adjustment.ccg	Thu Aug  7 15:23:26 2008
@@ -32,35 +32,6 @@
 {
 }
 
-void Adjustment::set_lower(double lower)
-{
-  gobj()->lower = lower;
-  changed();
-}
-
-void Adjustment::set_upper(double upper)
-{
-  gobj()->upper = upper;
-  changed();
-}
-
-void Adjustment::set_step_increment(double incr)
-{
-  gobj()->step_increment = incr;
-  changed();
-}
-
-void Adjustment::set_page_increment(double incr)
-{
-  gobj()->page_increment = incr;
-  changed();
-}
-
-void Adjustment::set_page_size(double size)
-{
-  gobj()->page_size = size;
-  changed();
-}
 
 } // namespace Gtk
 

Modified: trunk/gtk/src/adjustment.hg
==============================================================================
--- trunk/gtk/src/adjustment.hg	(original)
+++ trunk/gtk/src/adjustment.hg	Thu Aug  7 15:23:26 2008
@@ -70,58 +70,23 @@
   _WRAP_METHOD(void set_value(double value), gtk_adjustment_set_value)
   _WRAP_METHOD(double get_value() const, gtk_adjustment_get_value)
 
-  // Other internal fields accessors
-  /** Retrieve the @a lower member variable.
-   * @return The current value of @a lower.
-   */
-  _MEMBER_GET(lower,lower,double,double)
-
-  /** Retrieve the @a upper member variable.
-   * @return The current value of @a upper.
-   */
-  _MEMBER_GET(upper,upper,double,double)
-
-  /** Retrieve the @a step_increment variable.
-   * @return The current value of @a step_increment.
-   */
-  _MEMBER_GET(step_increment,step_increment,double,double)
-
-  /** Retrieve the @a page_increment variable.
-   * @return The current value of @a page_increment.
-   */
-  _MEMBER_GET(page_increment,page_increment,double,double)
-
-  /** Retrieve the @a page_size variable.
-   * @return The current value of @a page_size.
-   */
-  _MEMBER_GET(page_size,page_size,double,double)
-
-  // TODO: This section needs changing. We must be able to set more at a time,
-  // emitting "changed" signal only once.
-  /** Sets the @a lower member variable
-   * @param lower The value to set the @a lower member variable to.
-   */
-  void set_lower(double lower);
+
+  _WRAP_METHOD(void set_lower(double lower), gtk_adjustment_set_lower)
+  _WRAP_METHOD(double get_lower() const, gtk_adjustment_get_lower)
   
-  /** Sets the @a upper member variable
-   * @param upper The value to set the @a upper member variable to.
-   */
-  void set_upper(double upper);
-
-  /** Sets the @a step_increment member variable
-   * @param incr The value to set the @a step_incrememnt member variable to.
-   */
-  void set_step_increment(double incr);
-
-  /** Sets the @a page_increment member variable
-   * @param incr The value to set the @a page_increment member variable to.
-   */
-  void set_page_increment(double incr);
-
-  /** Sets the @a page_size member variable
-   * @param size The value to set the @ page_size member varialbe to.
-   */
-  void set_page_size(double size);
+  _WRAP_METHOD(void set_upper(double upper), gtk_adjustment_set_upper)
+  _WRAP_METHOD(double get_upper() const, gtk_adjustment_get_upper)
+
+  _WRAP_METHOD(void set_step_increment(double step_increment), gtk_adjustment_set_step_increment)
+  _WRAP_METHOD(double get_step_increment() const, gtk_adjustment_get_step_increment)
+
+  _WRAP_METHOD(void set_page_increment(double page_increment), gtk_adjustment_set_page_increment)
+  _WRAP_METHOD(double get_page_increment() const, gtk_adjustment_get_page_increment)
+
+  _WRAP_METHOD(void set_page_size(double page_size), gtk_adjustment_set_page_size)
+  _WRAP_METHOD(double get_page_size() const, gtk_adjustment_get_page_size)
+
+  _WRAP_METHOD(void configure(double value, double lower, double upper, double step_increment, double page_increment, double page_size), gtk_adjustment_configure)
 
   _WRAP_SIGNAL(void changed(), "changed")
   _WRAP_SIGNAL(void value_changed(), "value_changed")

Modified: trunk/gtk/src/combobox.hg
==============================================================================
--- trunk/gtk/src/combobox.hg	(original)
+++ trunk/gtk/src/combobox.hg	Thu Aug  7 15:23:26 2008
@@ -24,6 +24,7 @@
 #include <gtkmm/treemodel.h>
 #include <gtkmm/cellrenderer.h>
 #include <gtkmm/treeview.h>
+#include <gtkmm/enums.h> //For SensitivityType.
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/bin_p.h)
@@ -125,6 +126,9 @@
   void unset_row_separator_func();
   _IGNORE(gtk_combo_box_set_row_separator_func, gtk_combo_box_get_row_separator_func)
 
+  _WRAP_METHOD(void set_button_sensitivity(SensitivityType sensitivity), gtk_combo_box_set_button_sensitivity)
+  _WRAP_METHOD(SensitivityType get_button_sensitivity() const, gtk_combo_box_get_button_sensitivity)
+
   _WRAP_METHOD(void popup(), gtk_combo_box_popup)
   _WRAP_METHOD(void popdown(), gtk_combo_box_popdown)
 

Modified: trunk/gtk/src/enums.hg
==============================================================================
--- trunk/gtk/src/enums.hg	(original)
+++ trunk/gtk/src/enums.hg	Thu Aug  7 15:23:26 2008
@@ -97,6 +97,7 @@
 _WRAP_ENUM(WrapMode, GtkWrapMode)
 _WRAP_ENUM(SortType, GtkSortType)
 _WRAP_ENUM(PageOrientation, GtkPageOrientation)
+_WRAP_ENUM(SensitivityType, GtkSensitivityType)
 
 
 /* We use a class to implement the GtkIconSize enum, because you can register

Modified: trunk/gtk/src/filechooser.hg
==============================================================================
--- trunk/gtk/src/filechooser.hg	(original)
+++ trunk/gtk/src/filechooser.hg	Thu Aug  7 15:23:26 2008
@@ -20,6 +20,7 @@
 #include <gtkmm/widget.h>
 #include <gtkmm/filefilter.h>
 #include <glibmm/interface.h>
+#include <giomm/file.h>
 
 
 _DEFS(gtkmm,gtk)
@@ -113,6 +114,23 @@
   _WRAP_METHOD(bool set_current_folder_uri(const Glib::ustring& uri), gtk_file_chooser_set_current_folder_uri)
   _WRAP_METHOD(Glib::ustring get_current_folder_uri() const, gtk_file_chooser_get_current_folder_uri)
 
+  _WRAP_METHOD(bool set_file(const Glib::RefPtr<const Gio::File>& uri), gtk_file_chooser_set_file, errthrow)
+
+  _WRAP_METHOD(bool select_file(const Glib::RefPtr<const Gio::File>& file), gtk_file_chooser_select_file, errthrow)
+  _WRAP_METHOD(void unselect_file(const Glib::RefPtr<const Gio::File>& file), gtk_file_chooser_unselect_file)
+
+#m4 _CONVERSION(`GSList*',`Glib::SListHandle< Glib::RefPtr<Gio::File> >',`Glib::SListHandle< Glib::RefPtr<Gio::File> >($3, Glib::OWNERSHIP_DEEP)')
+  _WRAP_METHOD(Glib::SListHandle< Glib::RefPtr<Gio::File> > get_files(), gtk_file_chooser_get_files)
+
+  _WRAP_METHOD(bool set_current_folder_file(const Glib::RefPtr<const Gio::File>& file), gtk_file_chooser_set_current_folder_file, errthrow)
+
+  //No refreturn is needed here, because the C function provides a reference:
+  _WRAP_METHOD(Glib::RefPtr<Gio::File> get_current_folder_file(), gtk_file_chooser_get_current_folder_file)
+
+  //No refreturn is needed here, because the C function provides a reference:
+  _WRAP_METHOD(Glib::RefPtr<Gio::File> get_file(), gtk_file_chooser_get_file)
+  _WRAP_METHOD(Glib::RefPtr<const Gio::File> get_file() const, gtk_file_chooser_get_file, constversion)
+
 /* Preview widget
  */
   _WRAP_METHOD(void set_preview_widget(Gtk::Widget& preview_widget), gtk_file_chooser_set_preview_widget)
@@ -129,6 +147,10 @@
   _WRAP_METHOD(Glib::ustring get_preview_filename() const, gtk_file_chooser_get_preview_filename)
   _WRAP_METHOD(Glib::ustring get_preview_uri() const, gtk_file_chooser_get_preview_uri)
 
+  //No refreturn is needed here, because the C function provides a reference:
+  _WRAP_METHOD(Glib::RefPtr<Gio::File> get_preview_file(), gtk_file_chooser_get_preview_file)
+  _WRAP_METHOD(Glib::RefPtr<const Gio::File> get_preview_file() const, gtk_file_chooser_get_preview_file, constversion)
+
 /* Extra widget
  */
   _WRAP_METHOD(void set_extra_widget(Gtk::Widget& extra_widget), gtk_file_chooser_set_extra_widget)

Modified: trunk/gtk/src/gtk_methods.defs
==============================================================================
--- trunk/gtk/src/gtk_methods.defs	(original)
+++ trunk/gtk/src/gtk_methods.defs	Thu Aug  7 15:23:26 2008
@@ -2586,7 +2586,8 @@
   (values
     '("user-style" "PRIVATE_GTK_USER_STYLE")
     '("resize-pending" "PRIVATE_GTK_RESIZE_PENDING")
-    '("leave-pending" "PRIVATE_GTK_LEAVE_PENDING")
+    '("has-pointer" "PRIVATE_GTK_HAS_POINTER")
+    '("shadowed" "PRIVATE_GTK_SHADOWED")
     '("has-shape-mask" "PRIVATE_GTK_HAS_SHAPE_MASK")
     '("in-reparent" "PRIVATE_GTK_IN_REPARENT")
     '("direction-set" "PRIVATE_GTK_DIRECTION_SET")
@@ -4077,6 +4078,95 @@
   )
 )
 
+(define-method get_lower
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_get_lower")
+  (return-type "gdouble")
+)
+
+(define-method set_lower
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_set_lower")
+  (return-type "none")
+  (parameters
+    '("gdouble" "lower")
+  )
+)
+
+(define-method get_upper
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_get_upper")
+  (return-type "gdouble")
+)
+
+(define-method set_upper
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_set_upper")
+  (return-type "none")
+  (parameters
+    '("gdouble" "upper")
+  )
+)
+
+(define-method get_step_increment
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_get_step_increment")
+  (return-type "gdouble")
+)
+
+(define-method set_step_increment
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_set_step_increment")
+  (return-type "none")
+  (parameters
+    '("gdouble" "step_increment")
+  )
+)
+
+(define-method get_page_increment
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_get_page_increment")
+  (return-type "gdouble")
+)
+
+(define-method set_page_increment
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_set_page_increment")
+  (return-type "none")
+  (parameters
+    '("gdouble" "page_increment")
+  )
+)
+
+(define-method get_page_size
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_get_page_size")
+  (return-type "gdouble")
+)
+
+(define-method set_page_size
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_set_page_size")
+  (return-type "none")
+  (parameters
+    '("gdouble" "page_size")
+  )
+)
+
+(define-method configure
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_configure")
+  (return-type "none")
+  (parameters
+    '("gdouble" "value")
+    '("gdouble" "lower")
+    '("gdouble" "upper")
+    '("gdouble" "step_increment")
+    '("gdouble" "page_increment")
+    '("gdouble" "page_size")
+  )
+)
+
 
 
 ;; From gtkalias.h
@@ -6725,7 +6815,7 @@
   (parameters
     '("gint" "row")
     '("gpointer" "data")
-    '("GtkDestroyNotify" "destroy")
+    '("GDestroyNotify" "destroy")
   )
 )
 
@@ -7376,6 +7466,21 @@
   )
 )
 
+(define-method set_button_sensitivity
+  (of-object "GtkComboBox")
+  (c-name "gtk_combo_box_set_button_sensitivity")
+  (return-type "none")
+  (parameters
+    '("GtkSensitivityType" "sensitivity")
+  )
+)
+
+(define-method get_button_sensitivity
+  (of-object "GtkComboBox")
+  (c-name "gtk_combo_box_get_button_sensitivity")
+  (return-type "GtkSensitivityType")
+)
+
 (define-function gtk_combo_box_new_text
   (c-name "gtk_combo_box_new_text")
   (return-type "GtkWidget*")
@@ -8418,7 +8523,7 @@
   (parameters
     '("GtkCTreeNode*" "node")
     '("gpointer" "data")
-    '("GtkDestroyNotify" "destroy")
+    '("GDestroyNotify" "destroy")
   )
 )
 
@@ -10255,6 +10360,63 @@
   (return-type "gchar*")
 )
 
+(define-method get_file
+  (of-object "GtkFileChooser")
+  (c-name "gtk_file_chooser_get_file")
+  (return-type "GFile*")
+)
+
+(define-method set_file
+  (of-object "GtkFileChooser")
+  (c-name "gtk_file_chooser_set_file")
+  (return-type "gboolean")
+  (parameters
+    '("GFile*" "file")
+    '("GError**" "error")
+  )
+)
+
+(define-method select_file
+  (of-object "GtkFileChooser")
+  (c-name "gtk_file_chooser_select_file")
+  (return-type "gboolean")
+  (parameters
+    '("GFile*" "file")
+    '("GError**" "error")
+  )
+)
+
+(define-method unselect_file
+  (of-object "GtkFileChooser")
+  (c-name "gtk_file_chooser_unselect_file")
+  (return-type "none")
+  (parameters
+    '("GFile*" "file")
+  )
+)
+
+(define-method get_files
+  (of-object "GtkFileChooser")
+  (c-name "gtk_file_chooser_get_files")
+  (return-type "GSList*")
+)
+
+(define-method set_current_folder_file
+  (of-object "GtkFileChooser")
+  (c-name "gtk_file_chooser_set_current_folder_file")
+  (return-type "gboolean")
+  (parameters
+    '("GFile*" "file")
+    '("GError**" "error")
+  )
+)
+
+(define-method get_current_folder_file
+  (of-object "GtkFileChooser")
+  (c-name "gtk_file_chooser_get_current_folder_file")
+  (return-type "GFile*")
+)
+
 (define-method set_preview_widget
   (of-object "GtkFileChooser")
   (c-name "gtk_file_chooser_set_preview_widget")
@@ -10312,6 +10474,12 @@
   (return-type "char*")
 )
 
+(define-method get_preview_file
+  (of-object "GtkFileChooser")
+  (c-name "gtk_file_chooser_get_preview_file")
+  (return-type "GFile*")
+)
+
 (define-method set_extra_widget
   (of-object "GtkFileChooser")
   (c-name "gtk_file_chooser_set_extra_widget")
@@ -13246,7 +13414,7 @@
   (return-type "none")
   (parameters
     '("gpointer" "popup_data")
-    '("GtkDestroyNotify" "destroy")
+    '("GDestroyNotify" "destroy")
     '("guint" "x")
     '("guint" "y")
     '("guint" "mouse_button")
@@ -13275,7 +13443,7 @@
   (parameters
     '("GtkTranslateFunc" "func")
     '("gpointer" "data")
-    '("GtkDestroyNotify" "notify")
+    '("GDestroyNotify" "notify")
   )
 )
 
@@ -15916,7 +16084,7 @@
   (c-name "gtk_object_weakref")
   (return-type "none")
   (parameters
-    '("GtkDestroyNotify" "notify")
+    '("GDestroyNotify" "notify")
     '("gpointer" "data")
   )
 )
@@ -15926,7 +16094,7 @@
   (c-name "gtk_object_weakunref")
   (return-type "none")
   (parameters
-    '("GtkDestroyNotify" "notify")
+    '("GDestroyNotify" "notify")
     '("gpointer" "data")
   )
 )
@@ -15948,7 +16116,7 @@
   (parameters
     '("const-gchar*" "key")
     '("gpointer" "data")
-    '("GtkDestroyNotify" "destroy")
+    '("GDestroyNotify" "destroy")
   )
 )
 
@@ -16011,7 +16179,7 @@
   (parameters
     '("GQuark" "data_id")
     '("gpointer" "data")
-    '("GtkDestroyNotify" "destroy")
+    '("GDestroyNotify" "destroy")
   )
 )
 
@@ -18616,14 +18784,22 @@
   )
 )
 
+(define-function gtk_print_win32_devnames_from_printer_name
+  (c-name "gtk_print_win32_devnames_from_printer_name")
+  (return-type "GtkPrintWin32Devnames*")
+  (parameters
+    '("const-char*" "printer")
+  )
+)
+
 (define-method to_win32
   (of-object "GtkPrintWin32Devnames")
   (c-name "gtk_print_win32_devnames_to_win32")
   (return-type "HGLOBAL")
 )
 
-(define-function gtk_print_win32_devnames_from_printer_name
-  (c-name "gtk_print_win32_devnames_from_printer_name")
+(define-function gtk_print_win32_devnames_to_win32_from_printer_name
+  (c-name "gtk_print_win32_devnames_to_win32_from_printer_name")
   (return-type "HGLOBAL")
   (parameters
     '("const-char*" "printer")
@@ -21433,7 +21609,7 @@
     '("GtkSignalFunc" "func")
     '("GtkCallbackMarshal" "unsupported")
     '("gpointer" "data")
-    '("GtkDestroyNotify" "destroy_func")
+    '("GDestroyNotify" "destroy_func")
     '("gint" "object_signal")
     '("gint" "after")
   )
@@ -21935,6 +22111,14 @@
   )
 )
 
+(define-function gtk_status_icon_new_from_gicon
+  (c-name "gtk_status_icon_new_from_gicon")
+  (return-type "GtkStatusIcon*")
+  (parameters
+    '("GIcon*" "icon")
+  )
+)
+
 (define-method set_from_pixbuf
   (of-object "GtkStatusIcon")
   (c-name "gtk_status_icon_set_from_pixbuf")
@@ -21971,6 +22155,15 @@
   )
 )
 
+(define-method set_from_gicon
+  (of-object "GtkStatusIcon")
+  (c-name "gtk_status_icon_set_from_gicon")
+  (return-type "none")
+  (parameters
+    '("GIcon*" "icon")
+  )
+)
+
 (define-method get_storage_type
   (of-object "GtkStatusIcon")
   (c-name "gtk_status_icon_get_storage_type")
@@ -21995,6 +22188,15 @@
   (return-type "const-gchar*")
 )
 
+(define-method get_gicon
+  (of-object "GtkStatusIcon")
+  (c-name "gtk_status_icon_get_gicon")
+  (return-type "none")
+  (parameters
+    '("GIcon**" "icon")
+  )
+)
+
 (define-method get_size
   (of-object "GtkStatusIcon")
   (c-name "gtk_status_icon_get_size")
@@ -32299,9 +32501,9 @@
   )
 )
 
-(define-method get_default
+(define-method get_default_widget
   (of-object "GtkWindow")
-  (c-name "gtk_window_get_default")
+  (c-name "gtk_window_get_default_widget")
   (return-type "GtkWidget*")
 )
 
@@ -33005,7 +33207,7 @@
   (c-name "gtk_window_remove_embedded_xid")
   (return-type "none")
   (parameters
-    '("guint" "xid")
+    '("GdkNativeWindow" "xid")
   )
 )
 
@@ -33014,7 +33216,7 @@
   (c-name "gtk_window_add_embedded_xid")
   (return-type "none")
   (parameters
-    '("guint" "xid")
+    '("GdkNativeWindow" "xid")
   )
 )
 

Modified: trunk/gtk/src/gtk_signals.defs
==============================================================================
--- trunk/gtk/src/gtk_signals.defs	(original)
+++ trunk/gtk/src/gtk_signals.defs	Thu Aug  7 15:23:26 2008
@@ -564,6 +564,12 @@
   (when "last")
 )
 
+(define-signal monitors-changed
+  (of-object "GdkScreen")
+  (return-type "void")
+  (when "last")
+)
+
 (define-property font-options
   (of-object "GdkScreen")
   (prop-type "GParamPointer")
@@ -795,6 +801,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkAboutDialog")
+  (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 "GtkAboutDialog")
   (prop-type "GParamUInt")
@@ -1251,6 +1266,24 @@
   (construct-only #f)
 )
 
+(define-property is-locked
+  (of-object "GtkAccelGroup")
+  (prop-type "GParamBoolean")
+  (docs "Is the accel group locked")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property modifier-mask
+  (of-object "GtkAccelGroup")
+  (prop-type "GParamFlags")
+  (docs "Modifier Mask")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GtkAccelLabel
 
 (define-property user-data
@@ -1460,6 +1493,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkAccelLabel")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property xalign
   (of-object "GtkAccelLabel")
   (prop-type "GParamFloat")
@@ -2163,6 +2205,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkAlignment")
+  (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 "GtkAlignment")
   (prop-type "GParamUInt")
@@ -2471,6 +2522,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkArrow")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property xalign
   (of-object "GtkArrow")
   (prop-type "GParamFloat")
@@ -2734,6 +2794,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkAspectFrame")
+  (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 "GtkAspectFrame")
   (prop-type "GParamUInt")
@@ -3087,6 +3156,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkAssistant")
+  (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 "GtkAssistant")
   (prop-type "GParamUInt")
@@ -3575,6 +3653,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkBin")
+  (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 "GtkBin")
   (prop-type "GParamUInt")
@@ -3811,6 +3898,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkBox")
+  (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 "GtkBox")
   (prop-type "GParamUInt")
@@ -4112,6 +4208,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkButton")
+  (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 "GtkButton")
   (prop-type "GParamUInt")
@@ -4429,6 +4534,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkButtonBox")
+  (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 "GtkButtonBox")
   (prop-type "GParamUInt")
@@ -4734,6 +4848,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkCalendar")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property year
   (of-object "GtkCalendar")
   (prop-type "GParamInt")
@@ -4824,6 +4947,33 @@
   (construct-only #f)
 )
 
+(define-property show-details
+  (of-object "GtkCalendar")
+  (prop-type "GParamBoolean")
+  (docs "If TRUE, details are shown")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property detail-width-chars
+  (of-object "GtkCalendar")
+  (prop-type "GParamInt")
+  (docs "Details width in characters")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property detail-height-rows
+  (of-object "GtkCalendar")
+  (prop-type "GParamInt")
+  (docs "Details height in rows")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkCheckButton
 
 (define-property user-data
@@ -5033,6 +5183,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkCheckButton")
+  (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 "GtkCheckButton")
   (prop-type "GParamUInt")
@@ -5383,6 +5542,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkCheckMenuItem")
+  (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 "GtkCheckMenuItem")
   (prop-type "GParamUInt")
@@ -5419,6 +5587,15 @@
   (construct-only #f)
 )
 
+(define-property right-justified
+  (of-object "GtkCheckMenuItem")
+  (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 "GtkCheckMenuItem")
   (prop-type "GParamObject")
@@ -5437,6 +5614,15 @@
   (construct-only #f)
 )
 
+(define-property accel-path
+  (of-object "GtkCheckMenuItem")
+  (prop-type "GParamString")
+  (docs "Sets the accelerator path of the menu item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property active
   (of-object "GtkCheckMenuItem")
   (prop-type "GParamBoolean")
@@ -5813,6 +5999,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkCList")
+  (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 "GtkCList")
   (prop-type "GParamUInt")
@@ -6076,6 +6271,15 @@
   (construct-only #f)
 )
 
+(define-property editing
+  (of-object "GtkCellRenderer")
+  (prop-type "GParamBoolean")
+  (docs "Whether the cell renderer is currently in editing mode")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GtkCellRendererAccel
 
 (define-signal accel-edited
@@ -6243,6 +6447,15 @@
   (construct-only #f)
 )
 
+(define-property editing
+  (of-object "GtkCellRendererAccel")
+  (prop-type "GParamBoolean")
+  (docs "Whether the cell renderer is currently in editing mode")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property text
   (of-object "GtkCellRendererAccel")
   (prop-type "GParamString")
@@ -6687,6 +6900,16 @@
   )
 )
 
+(define-signal changed
+  (of-object "GtkCellRendererCombo")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("const-gchar*" "p0")
+    '("GtkTreeIter*" "p1")
+  )
+)
+
 (define-property user-data
   (of-object "GtkCellRendererCombo")
   (prop-type "GParamPointer")
@@ -6831,6 +7054,15 @@
   (construct-only #f)
 )
 
+(define-property editing
+  (of-object "GtkCellRendererCombo")
+  (prop-type "GParamBoolean")
+  (docs "Whether the cell renderer is currently in editing mode")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property text
   (of-object "GtkCellRendererCombo")
   (prop-type "GParamString")
@@ -7400,6 +7632,15 @@
   (construct-only #f)
 )
 
+(define-property editing
+  (of-object "GtkCellRendererProgress")
+  (prop-type "GParamBoolean")
+  (docs "Whether the cell renderer is currently in editing mode")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property value
   (of-object "GtkCellRendererProgress")
   (prop-type "GParamInt")
@@ -7610,6 +7851,15 @@
   (construct-only #f)
 )
 
+(define-property editing
+  (of-object "GtkCellRendererText")
+  (prop-type "GParamBoolean")
+  (docs "Whether the cell renderer is currently in editing mode")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property text
   (of-object "GtkCellRendererText")
   (prop-type "GParamString")
@@ -8161,6 +8411,15 @@
   (construct-only #f)
 )
 
+(define-property editing
+  (of-object "GtkCellRendererToggle")
+  (prop-type "GParamBoolean")
+  (docs "Whether the cell renderer is currently in editing mode")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property activatable
   (of-object "GtkCellRendererToggle")
   (prop-type "GParamBoolean")
@@ -8352,6 +8611,15 @@
   (construct-only #f)
 )
 
+(define-property editing
+  (of-object "GtkCellRendererPixbuf")
+  (prop-type "GParamBoolean")
+  (docs "Whether the cell renderer is currently in editing mode")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property pixbuf
   (of-object "GtkCellRendererPixbuf")
   (prop-type "GParamObject")
@@ -8433,6 +8701,15 @@
   (construct-only #f)
 )
 
+(define-property gicon
+  (of-object "GtkCellRendererPixbuf")
+  (prop-type "GParamObject")
+  (docs "The GIcon being displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkCellRendererProgress
 
 (define-property user-data
@@ -8579,6 +8856,15 @@
   (construct-only #f)
 )
 
+(define-property editing
+  (of-object "GtkCellRendererProgress")
+  (prop-type "GParamBoolean")
+  (docs "Whether the cell renderer is currently in editing mode")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property value
   (of-object "GtkCellRendererProgress")
   (prop-type "GParamInt")
@@ -8779,6 +9065,15 @@
   (construct-only #f)
 )
 
+(define-property editing
+  (of-object "GtkCellRendererSpin")
+  (prop-type "GParamBoolean")
+  (docs "Whether the cell renderer is currently in editing mode")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property text
   (of-object "GtkCellRendererSpin")
   (prop-type "GParamString")
@@ -9428,6 +9723,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkColorButton")
+  (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 "GtkColorButton")
   (prop-type "GParamUInt")
@@ -9787,6 +10091,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkColorSelection")
+  (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 "GtkColorSelection")
   (prop-type "GParamUInt")
@@ -10077,6 +10390,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkCombo")
+  (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 "GtkCombo")
   (prop-type "GParamUInt")
@@ -10403,6 +10725,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkComboBox")
+  (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 "GtkComboBox")
   (prop-type "GParamUInt")
@@ -10762,6 +11093,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkContainer")
+  (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 "GtkContainer")
   (prop-type "GParamUInt")
@@ -11056,6 +11396,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkCTree")
+  (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 "GtkCTree")
   (prop-type "GParamUInt")
@@ -11418,6 +11767,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkCellView")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property background
   (of-object "GtkCellView")
   (prop-type "GParamString")
@@ -11669,6 +12027,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkCurve")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property curve-type
   (of-object "GtkCurve")
   (prop-type "GParamEnum")
@@ -11938,6 +12305,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkDialog")
+  (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 "GtkDialog")
   (prop-type "GParamUInt")
@@ -12719,6 +13095,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkEntry")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property cursor-position
   (of-object "GtkEntry")
   (prop-type "GParamInt")
@@ -12872,6 +13257,24 @@
   (construct-only #f)
 )
 
+(define-property overwrite-mode
+  (of-object "GtkEntry")
+  (prop-type "GParamBoolean")
+  (docs "Whether new text overwrites existing text")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property text-length
+  (of-object "GtkEntry")
+  (prop-type "GParamUInt")
+  (docs "Length of the text currently in the entry")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GtkEntryCompletion
 
 (define-signal insert-prefix
@@ -13193,6 +13596,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkEventBox")
+  (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 "GtkEventBox")
   (prop-type "GParamUInt")
@@ -13453,6 +13865,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkExpander")
+  (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 "GtkExpander")
   (prop-type "GParamUInt")
@@ -13562,15 +13983,6 @@
   (construct-only #f)
 )
 
-(define-property use-preview-label
-  (of-object "GtkFileChooserButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to display a stock label with the name of the previewed file.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property show-hidden
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
@@ -13580,37 +13992,37 @@
   (construct-only #f)
 )
 
-(define-property extra-widget
+(define-property local-only
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for extra options.")
+  (prop-type "GParamBoolean")
+  (docs "Whether the selected file(s) should be limited to local file: URLs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property filter
+(define-property do-overwrite-confirmation
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which files are displayed")
+  (prop-type "GParamBoolean")
+  (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 local-only
+(define-property select-multiple
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected file(s) should be limited to local file: URLs")
+  (docs "Whether to allow multiple files to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property action
+(define-property use-preview-label
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamEnum")
-  (docs "The type of operation that the file selector is performing")
+  (prop-type "GParamBoolean")
+  (docs "Whether to display a stock label with the name of the previewed file.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -13625,19 +14037,28 @@
   (construct-only #t)
 )
 
-(define-property select-multiple
+(define-property filter
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which files are displayed")
   (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)
+)
+
+(define-property preview-widget
+  (of-object "GtkFileChooserButton")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for custom previews.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -13859,6 +14280,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkFileChooserButton")
+  (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 "GtkFileChooserButton")
   (prop-type "GParamUInt")
@@ -13951,15 +14381,6 @@
   (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)
-)
-
 (define-property show-hidden
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
@@ -13969,37 +14390,37 @@
   (construct-only #f)
 )
 
-(define-property extra-widget
+(define-property local-only
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for extra options.")
+  (prop-type "GParamBoolean")
+  (docs "Whether the selected file(s) should be limited to local file: URLs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property filter
+(define-property do-overwrite-confirmation
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which files are displayed")
+  (prop-type "GParamBoolean")
+  (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 local-only
+(define-property select-multiple
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected file(s) should be limited to local file: URLs")
+  (docs "Whether to allow multiple files to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property action
+(define-property use-preview-label
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamEnum")
-  (docs "The type of operation that the file selector is performing")
+  (prop-type "GParamBoolean")
+  (docs "Whether to display a stock label with the name of the previewed file.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14014,19 +14435,28 @@
   (construct-only #t)
 )
 
-(define-property select-multiple
+(define-property filter
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which files are displayed")
   (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)
+)
+
+(define-property preview-widget
+  (of-object "GtkFileChooserDialog")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for custom previews.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14248,6 +14678,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkFileChooserDialog")
+  (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 "GtkFileChooserDialog")
   (prop-type "GParamUInt")
@@ -14547,15 +14986,6 @@
   (construct-only #f)
 )
 
-(define-property use-preview-label
-  (of-object "GtkFileChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether to display a stock label with the name of the previewed file.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property show-hidden
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
@@ -14565,37 +14995,37 @@
   (construct-only #f)
 )
 
-(define-property extra-widget
+(define-property local-only
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for extra options.")
+  (prop-type "GParamBoolean")
+  (docs "Whether the selected file(s) should be limited to local file: URLs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property filter
+(define-property do-overwrite-confirmation
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which files are displayed")
+  (prop-type "GParamBoolean")
+  (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 local-only
+(define-property select-multiple
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected file(s) should be limited to local file: URLs")
+  (docs "Whether to allow multiple files to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property action
+(define-property use-preview-label
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamEnum")
-  (docs "The type of operation that the file selector is performing")
+  (prop-type "GParamBoolean")
+  (docs "Whether to display a stock label with the name of the previewed file.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14610,19 +15040,28 @@
   (construct-only #t)
 )
 
-(define-property select-multiple
+(define-property filter
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which files are displayed")
   (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)
+)
+
+(define-property preview-widget
+  (of-object "GtkFileChooserWidget")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for custom previews.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14844,6 +15283,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkFileChooserWidget")
+  (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 "GtkFileChooserWidget")
   (prop-type "GParamUInt")
@@ -15098,6 +15546,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkFileSelection")
+  (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 "GtkFileSelection")
   (prop-type "GParamUInt")
@@ -15622,6 +16079,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkFixed")
+  (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 "GtkFixed")
   (prop-type "GParamUInt")
@@ -15864,6 +16330,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkFontButton")
+  (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 "GtkFontButton")
   (prop-type "GParamUInt")
@@ -16235,6 +16710,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkFontSelection")
+  (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 "GtkFontSelection")
   (prop-type "GParamUInt")
@@ -16516,6 +17000,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkFontSelectionDialog")
+  (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 "GtkFontSelectionDialog")
   (prop-type "GParamUInt")
@@ -17013,6 +17506,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkFrame")
+  (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 "GtkFrame")
   (prop-type "GParamUInt")
@@ -17105,7 +17607,7 @@
   )
 )
 
-(define-signal child-attached
+(define-signal child-detached
   (of-object "GtkHandleBox")
   (return-type "void")
   (when "first")
@@ -17321,6 +17823,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkHandleBox")
+  (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 "GtkHandleBox")
   (prop-type "GParamUInt")
@@ -17402,6 +17913,15 @@
   (construct-only #f)
 )
 
+(define-property child-detached
+  (of-object "GtkHandleBox")
+  (prop-type "GParamBoolean")
+  (docs "A boolean value indicating whether the handlebox's child is attached or detached.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GtkIconTheme
 
 (define-signal changed
@@ -17619,6 +18139,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkImage")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property xalign
   (of-object "GtkImage")
   (prop-type "GParamFloat")
@@ -17772,6 +18301,15 @@
   (construct-only #f)
 )
 
+(define-property gicon
+  (of-object "GtkImage")
+  (prop-type "GParamObject")
+  (docs "The GIcon being displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkInputDialog
 
 (define-signal enable-device
@@ -17999,6 +18537,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkInputDialog")
+  (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 "GtkInputDialog")
   (prop-type "GParamUInt")
@@ -18496,6 +19043,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkInvisible")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property screen
   (of-object "GtkInvisible")
   (prop-type "GParamObject")
@@ -18732,6 +19288,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkItem")
+  (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 "GtkItem")
   (prop-type "GParamUInt")
@@ -19033,6 +19598,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkIconView")
+  (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 "GtkIconView")
   (prop-type "GParamUInt")
@@ -19186,6 +19760,15 @@
   (construct-only #f)
 )
 
+(define-property tooltip-column
+  (of-object "GtkIconView")
+  (prop-type "GParamInt")
+  (docs "The column in the model containing the tooltip texts for the items")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkLabel
 
 (define-signal move-cursor
@@ -19421,6 +20004,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkLabel")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property xalign
   (of-object "GtkLabel")
   (prop-type "GParamFloat")
@@ -19838,6 +20430,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkLayout")
+  (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 "GtkLayout")
   (prop-type "GParamUInt")
@@ -20110,6 +20711,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkLinkButton")
+  (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 "GtkLinkButton")
   (prop-type "GParamUInt")
@@ -20460,6 +21070,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkList")
+  (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 "GtkList")
   (prop-type "GParamUInt")
@@ -20778,6 +21397,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkListItem")
+  (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 "GtkListItem")
   (prop-type "GParamUInt")
@@ -21023,6 +21651,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkMenu")
+  (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 "GtkMenu")
   (prop-type "GParamUInt")
@@ -21095,6 +21732,42 @@
   (construct-only #f)
 )
 
+(define-property active
+  (of-object "GtkMenu")
+  (prop-type "GParamInt")
+  (docs "The currently selected menu item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property accel-group
+  (of-object "GtkMenu")
+  (prop-type "GParamObject")
+  (docs "The accel group holding accelerators for the menu")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property accel-path
+  (of-object "GtkMenu")
+  (prop-type "GParamString")
+  (docs "An accel path used to conveniently construct accel paths of child items")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property attach-widget
+  (of-object "GtkMenu")
+  (prop-type "GParamObject")
+  (docs "The widget the menu is attached to")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property tearoff-state
   (of-object "GtkMenu")
   (prop-type "GParamBoolean")
@@ -21122,6 +21795,15 @@
   (construct-only #f)
 )
 
+(define-property monitor
+  (of-object "GtkMenu")
+  (prop-type "GParamInt")
+  (docs "The monitor the menu will be popped up on")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkMenuBar
 
 (define-property user-data
@@ -21331,6 +22013,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkMenuBar")
+  (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 "GtkMenuBar")
   (prop-type "GParamUInt")
@@ -21404,7 +22095,7 @@
   (return-type "void")
   (when "first")
   (parameters
-    '("gint*" "p0")
+    '("int*" "p0")
   )
 )
 
@@ -21624,6 +22315,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkMenuItem")
+  (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 "GtkMenuItem")
   (prop-type "GParamUInt")
@@ -21660,6 +22360,15 @@
   (construct-only #f)
 )
 
+(define-property right-justified
+  (of-object "GtkMenuItem")
+  (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 "GtkMenuItem")
   (prop-type "GParamObject")
@@ -21678,6 +22387,15 @@
   (construct-only #f)
 )
 
+(define-property accel-path
+  (of-object "GtkMenuItem")
+  (prop-type "GParamString")
+  (docs "Sets the accelerator path of the menu item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkMenuShell
 
 (define-signal deactivate
@@ -21941,6 +22659,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkMenuShell")
+  (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 "GtkMenuShell")
   (prop-type "GParamUInt")
@@ -22192,6 +22919,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkMenuToolButton")
+  (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 "GtkMenuToolButton")
   (prop-type "GParamUInt")
@@ -22518,6 +23254,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkMessageDialog")
+  (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 "GtkMessageDialog")
   (prop-type "GParamUInt")
@@ -23078,6 +23823,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkMisc")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property xalign
   (of-object "GtkMisc")
   (prop-type "GParamFloat")
@@ -23420,6 +24174,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkNotebook")
+  (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 "GtkNotebook")
   (prop-type "GParamUInt")
@@ -23787,6 +24550,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkOptionMenu")
+  (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 "GtkOptionMenu")
   (prop-type "GParamUInt")
@@ -24158,6 +24930,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkPaned")
+  (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 "GtkPaned")
   (prop-type "GParamUInt")
@@ -24430,6 +25211,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkPixmap")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property xalign
   (of-object "GtkPixmap")
   (prop-type "GParamFloat")
@@ -24681,6 +25471,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkPlug")
+  (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 "GtkPlug")
   (prop-type "GParamUInt")
@@ -24978,6 +25777,15 @@
   (construct-only #f)
 )
 
+(define-property socket-window
+  (of-object "GtkPlug")
+  (prop-type "GParamObject")
+  (docs "The window of the socket the plug is embedded in")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GtkPreview
 
 (define-property user-data
@@ -25288,6 +26096,24 @@
   (construct-only #t)
 )
 
+(define-property paused
+  (of-object "GtkPrinter")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if this printer is paused")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property accepting-jobs
+  (of-object "GtkPrinter")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if this printer is accepting new jobs")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GtkPrintJob
 
 (define-signal status-changed
@@ -25769,6 +26595,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkPageSetupUnixDialog")
+  (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 "GtkPageSetupUnixDialog")
   (prop-type "GParamUInt")
@@ -26266,6 +27101,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkPrintUnixDialog")
+  (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 "GtkPrintUnixDialog")
   (prop-type "GParamUInt")
@@ -26799,6 +27643,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkProgress")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property activity-mode
   (of-object "GtkProgress")
   (prop-type "GParamBoolean")
@@ -27044,6 +27897,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkProgressBar")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property activity-mode
   (of-object "GtkProgressBar")
   (prop-type "GParamBoolean")
@@ -27385,6 +28247,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkRadioButton")
+  (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 "GtkRadioButton")
   (prop-type "GParamUInt")
@@ -27738,12 +28609,21 @@
   (construct-only #f)
 )
 
-(define-property border-width
+(define-property window
   (of-object "GtkRadioToolButton")
-  (prop-type "GParamUInt")
-  (docs "The width of the empty border outside the containers children")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
   (readable #t)
-  (writable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property border-width
+  (of-object "GtkRadioToolButton")
+  (prop-type "GParamUInt")
+  (docs "The width of the empty border outside the containers children")
+  (readable #t)
+  (writable #t)
   (construct-only #f)
 )
 
@@ -28261,6 +29141,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkRadioMenuItem")
+  (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 "GtkRadioMenuItem")
   (prop-type "GParamUInt")
@@ -28297,6 +29186,15 @@
   (construct-only #f)
 )
 
+(define-property right-justified
+  (of-object "GtkRadioMenuItem")
+  (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 "GtkRadioMenuItem")
   (prop-type "GParamObject")
@@ -28315,6 +29213,15 @@
   (construct-only #f)
 )
 
+(define-property accel-path
+  (of-object "GtkRadioMenuItem")
+  (prop-type "GParamString")
+  (docs "Sets the accelerator path of the menu item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property active
   (of-object "GtkRadioMenuItem")
   (prop-type "GParamBoolean")
@@ -28594,6 +29501,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkRange")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property update-policy
   (of-object "GtkRange")
   (prop-type "GParamEnum")
@@ -28677,28 +29593,19 @@
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property local-only
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sort-type
-  (of-object "GtkRecentAction")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+  (docs "Whether the selected resource(s) should be limited to local file: URIs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property limit
+(define-property show-private
   (of-object "GtkRecentAction")
-  (prop-type "GParamInt")
-  (docs "The maximum number of items to be displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -28713,46 +29620,55 @@
   (construct-only #t)
 )
 
-(define-property filter
+(define-property show-not-found
   (of-object "GtkRecentAction")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which resources are 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-tips
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected resource(s) should be limited to local file: URIs")
+  (docs "Whether there should be a tooltip on the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-private
+(define-property limit
   (of-object "GtkRecentAction")
-  (prop-type "GParamBoolean")
-  (docs "Whether the private items should be 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 select-multiple
   (of-object "GtkRecentAction")
   (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)
 )
 
-(define-property show-tips
+(define-property filter
   (of-object "GtkRecentAction")
-  (prop-type "GParamBoolean")
-  (docs "Whether there should be a tooltip on the item")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which resources are displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sort-type
+  (of-object "GtkRecentAction")
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -28916,28 +29832,19 @@
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property local-only
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sort-type
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+  (docs "Whether the selected resource(s) should be limited to local file: URIs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property limit
+(define-property show-private
   (of-object "GtkRecentChooser")
-  (prop-type "GParamInt")
-  (docs "The maximum number of items to be displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -28952,46 +29859,55 @@
   (construct-only #t)
 )
 
-(define-property filter
+(define-property show-not-found
   (of-object "GtkRecentChooser")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which resources are 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-tips
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected resource(s) should be limited to local file: URIs")
+  (docs "Whether there should be a tooltip on the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-private
+(define-property limit
   (of-object "GtkRecentChooser")
-  (prop-type "GParamBoolean")
-  (docs "Whether the private items should be 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 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)
 )
 
-(define-property show-tips
+(define-property filter
   (of-object "GtkRecentChooser")
-  (prop-type "GParamBoolean")
-  (docs "Whether there should be a tooltip on the item")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which resources are displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sort-type
+  (of-object "GtkRecentChooser")
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29008,19 +29924,46 @@
   (construct-only #f)
 )
 
-(define-property select-multiple
+(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 sort-type
+(define-property show-private
   (of-object "GtkRecentChooserMenu")
-  (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 recent-manager
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamObject")
+  (docs "The RecentManager object to use")
+  (readable #f)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property show-not-found
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamBoolean")
+  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property show-tips
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamBoolean")
+  (docs "Whether there should be a tooltip on the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29035,8 +29978,17 @@
   (construct-only #f)
 )
 
-(define-property recent-manager
+(define-property select-multiple
   (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamBoolean")
+  (docs "Whether to allow multiple items to be selected")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property recent-manager
+  (of-object "GtkRecentChooser")
   (prop-type "GParamObject")
   (docs "The RecentManager object to use")
   (readable #f)
@@ -29045,7 +29997,7 @@
 )
 
 (define-property filter
-  (of-object "GtkRecentChooserMenu")
+  (of-object "GtkRecentChooser")
   (prop-type "GParamObject")
   (docs "The current filter for selecting which resources are displayed")
   (readable #t)
@@ -29053,19 +30005,10 @@
   (construct-only #f)
 )
 
-(define-property local-only
-  (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 show-private
+(define-property sort-type
   (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamBoolean")
-  (docs "Whether the private items should be displayed")
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29296,6 +30239,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkRecentChooserMenu")
+  (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 "GtkRecentChooserMenu")
   (prop-type "GParamUInt")
@@ -29368,6 +30320,42 @@
   (construct-only #f)
 )
 
+(define-property active
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamInt")
+  (docs "The currently selected menu item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property accel-group
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamObject")
+  (docs "The accel group holding accelerators for the menu")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property accel-path
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamString")
+  (docs "An accel path used to conveniently construct accel paths of child items")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property attach-widget
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamObject")
+  (docs "The widget the menu is attached to")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property tearoff-state
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
@@ -29395,6 +30383,15 @@
   (construct-only #f)
 )
 
+(define-property monitor
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamInt")
+  (docs "The monitor the menu will be popped up on")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property show-numbers
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
@@ -29415,28 +30412,19 @@
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property local-only
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property sort-type
-  (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+  (docs "Whether the selected resource(s) should be limited to local file: URIs")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property limit
+(define-property show-private
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamInt")
-  (docs "The maximum number of items to be displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29451,46 +30439,55 @@
   (construct-only #t)
 )
 
-(define-property filter
+(define-property show-not-found
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which resources are 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-tips
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether the selected resource(s) should be limited to local file: URIs")
+  (docs "Whether there should be a tooltip on the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-private
+(define-property limit
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether the private items should be 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 filter
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which resources are displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-tips
+(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
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether there should be a tooltip on the item")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29703,6 +30700,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkRecentChooserWidget")
+  (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 "GtkRecentChooserWidget")
   (prop-type "GParamUInt")
@@ -30003,6 +31009,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkRuler")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property lower
   (of-object "GtkRuler")
   (prop-type "GParamDouble")
@@ -30266,6 +31281,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkScale")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property update-policy
   (of-object "GtkScale")
   (prop-type "GParamEnum")
@@ -30595,6 +31619,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkScaleButton")
+  (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 "GtkScaleButton")
   (prop-type "GParamUInt")
@@ -30712,6 +31745,15 @@
   (construct-only #f)
 )
 
+(define-property orientation
+  (of-object "GtkScaleButton")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the scale")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property value
   (of-object "GtkScaleButton")
   (prop-type "GParamDouble")
@@ -30957,6 +31999,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkScrollbar")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property update-policy
   (of-object "GtkScrollbar")
   (prop-type "GParamEnum")
@@ -31257,6 +32308,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkScrolledWindow")
+  (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 "GtkScrolledWindow")
   (prop-type "GParamUInt")
@@ -31556,6 +32616,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkSeparator")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GtkSeparatorToolItem
 
 (define-property user-data
@@ -31765,6 +32834,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkSeparatorToolItem")
+  (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 "GtkSeparatorToolItem")
   (prop-type "GParamUInt")
@@ -32325,6 +33403,24 @@
   (construct-only #f)
 )
 
+(define-property gtk-toolbar-style
+  (of-object "GtkSettings")
+  (prop-type "GParamEnum")
+  (docs "Whether default toolbars have text only, text and icons, icons only, etc.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property gtk-toolbar-icon-size
+  (of-object "GtkSettings")
+  (prop-type "GParamEnum")
+  (docs "Size of icons in default toolbars")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property gtk-label-select-on-focus
   (of-object "GtkSettings")
   (prop-type "GParamBoolean")
@@ -32593,6 +33689,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkSocket")
+  (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 "GtkSocket")
   (prop-type "GParamUInt")
@@ -32628,12 +33733,18 @@
   (when "last")
 )
 
+(define-signal value-changed
+  (of-object "GtkSpinButton")
+  (return-type "void")
+  (when "last")
+)
+
 (define-signal input
   (of-object "GtkSpinButton")
   (return-type "gint")
   (when "last")
   (parameters
-    '("gdouble*" "p0")
+    '("double*" "p0")
   )
 )
 
@@ -32865,6 +33976,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkSpinButton")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property cursor-position
   (of-object "GtkSpinButton")
   (prop-type "GParamInt")
@@ -33018,6 +34138,24 @@
   (construct-only #f)
 )
 
+(define-property overwrite-mode
+  (of-object "GtkSpinButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether new text overwrites existing text")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property text-length
+  (of-object "GtkSpinButton")
+  (prop-type "GParamUInt")
+  (docs "Length of the text currently in the entry")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property adjustment
   (of-object "GtkSpinButton")
   (prop-type "GParamObject")
@@ -33319,6 +34457,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkStatusbar")
+  (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 "GtkStatusbar")
   (prop-type "GParamUInt")
@@ -33436,6 +34583,15 @@
   (construct-only #f)
 )
 
+(define-property gicon
+  (of-object "GtkStatusIcon")
+  (prop-type "GParamObject")
+  (docs "The GIcon being displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property storage-type
   (of-object "GtkStatusIcon")
   (prop-type "GParamEnum")
@@ -33722,6 +34878,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkTable")
+  (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 "GtkTable")
   (prop-type "GParamUInt")
@@ -34003,6 +35168,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkTearoffMenuItem")
+  (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 "GtkTearoffMenuItem")
   (prop-type "GParamUInt")
@@ -34039,6 +35213,15 @@
   (construct-only #f)
 )
 
+(define-property right-justified
+  (of-object "GtkTearoffMenuItem")
+  (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 "GtkTearoffMenuItem")
   (prop-type "GParamObject")
@@ -34057,6 +35240,15 @@
   (construct-only #f)
 )
 
+(define-property accel-path
+  (of-object "GtkTearoffMenuItem")
+  (prop-type "GParamString")
+  (docs "Sets the accelerator path of the menu item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkTipsQuery
 
 (define-signal start-query
@@ -34301,6 +35493,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkTipsQuery")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 (define-property xalign
   (of-object "GtkTipsQuery")
   (prop-type "GParamFloat")
@@ -34750,6 +35951,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkToggleButton")
+  (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 "GtkToggleButton")
   (prop-type "GParamUInt")
@@ -35132,6 +36342,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkToolbar")
+  (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 "GtkToolbar")
   (prop-type "GParamUInt")
@@ -35445,6 +36664,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkToolItem")
+  (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 "GtkToolItem")
   (prop-type "GParamUInt")
@@ -35714,6 +36942,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkToolButton")
+  (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 "GtkToolButton")
   (prop-type "GParamUInt")
@@ -36961,6 +38198,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkTextView")
+  (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 "GtkTextView")
   (prop-type "GParamUInt")
@@ -37481,6 +38727,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkToggleToolButton")
+  (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 "GtkToggleToolButton")
   (prop-type "GParamUInt")
@@ -37982,6 +39237,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkTreeView")
+  (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 "GtkTreeView")
   (prop-type "GParamUInt")
@@ -38180,6 +39444,15 @@
   (construct-only #f)
 )
 
+(define-property tooltip-column
+  (of-object "GtkTreeView")
+  (prop-type "GParamInt")
+  (docs "The column in the model containing the tooltip texts for the rows")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkTreeViewColumn
 
 (define-signal clicked
@@ -38633,6 +39906,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkViewport")
+  (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 "GtkViewport")
   (prop-type "GParamUInt")
@@ -38896,6 +40178,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkVolumeButton")
+  (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 "GtkVolumeButton")
   (prop-type "GParamUInt")
@@ -39013,6 +40304,15 @@
   (construct-only #f)
 )
 
+(define-property orientation
+  (of-object "GtkVolumeButton")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the scale")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property value
   (of-object "GtkVolumeButton")
   (prop-type "GParamDouble")
@@ -39591,6 +40891,15 @@
   (return-type "gboolean")
   (when "last")
   (parameters
+    '("GdkEvent*" "p0")
+  )
+)
+
+(define-signal damage-event
+  (of-object "GtkWidget")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
     '("GdkEventExpose*" "p0")
   )
 )
@@ -39862,6 +41171,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkWidget")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GtkWindow
 
 (define-signal set-focus
@@ -40107,6 +41425,15 @@
   (construct-only #f)
 )
 
+(define-property window
+  (of-object "GtkWindow")
+  (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 "GtkWindow")
   (prop-type "GParamUInt")

Modified: trunk/gtk/src/range.hg
==============================================================================
--- trunk/gtk/src/range.hg	(original)
+++ trunk/gtk/src/range.hg	Thu Aug  7 15:23:26 2008
@@ -18,6 +18,7 @@
  */
 
 #include <gtkmm/widget.h>
+#include <gtkmm/enums.h> //For SensitivityType.
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/widget_p.h)
 
@@ -25,8 +26,6 @@
 namespace Gtk
 {
 
-_WRAP_ENUM(SensitivityType, GtkSensitivityType)
-
 class Adjustment;
 
 /** Base class for widgets which visualize an adjustment.

Modified: trunk/gtk/src/statusicon.ccg
==============================================================================
--- trunk/gtk/src/statusicon.ccg	(original)
+++ trunk/gtk/src/statusicon.ccg	Thu Aug  7 15:23:26 2008
@@ -52,6 +52,20 @@
 			button, activate_time);
 }
 
+Glib::RefPtr<Gio::Icon> StatusIcon::get_icon()
+{
+  GIcon* cicon = 0;
+  gtk_status_icon_get_gicon(gobj(), &cicon);
+  return Glib::wrap(cicon, true /* take a reference */);
+}
+
+Glib::RefPtr<const Gio::Icon> StatusIcon::get_icon() const
+{
+  return const_cast<StatusIcon*>(this)->get_icon();
+}
+
+
+
 
 } // namespace Gtk
 

Modified: trunk/gtk/src/statusicon.hg
==============================================================================
--- trunk/gtk/src/statusicon.hg	(original)
+++ trunk/gtk/src/statusicon.hg	Thu Aug  7 15:23:26 2008
@@ -58,6 +58,7 @@
   _WRAP_CTOR(StatusIcon(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_status_icon_new_from_pixbuf)
   _WRAP_CTOR(StatusIcon(const StockID& stock), gtk_status_icon_new_from_stock)
   _WRAP_CTOR(StatusIcon(const Glib::ustring& icon_name), gtk_status_icon_new_from_icon_name)
+  _WRAP_CTOR(StatusIcon(const Glib::RefPtr<const Gio::Icon>& icon), gtk_status_icon_new_from_gicon)
 
 public:
   /** Creates a new Gtk::StatusIcon object.
@@ -83,6 +84,7 @@
   _WRAP_METHOD(void set_from_file(const Glib::ustring& filename), gtk_status_icon_set_from_file)
   _WRAP_METHOD(void set(const StockID& stock_id), gtk_status_icon_set_from_stock)
   _WRAP_METHOD(void set(const Glib::ustring& icon_name), gtk_status_icon_set_from_icon_name)
+  _WRAP_METHOD(void set(const Glib::RefPtr<const Gio::Icon>& icon), gtk_status_icon_set_from_gicon)
 
   _WRAP_METHOD(ImageType get_storage_type() const, gtk_status_icon_get_storage_type)
 
@@ -92,6 +94,12 @@
   _WRAP_METHOD(StockID get_stock() const, gtk_status_icon_get_stock)
   _WRAP_METHOD(Glib::ustring get_icon_name() const, gtk_status_icon_get_icon_name)
 
+  //Hand-written because the C function uses an output parameter. 
+  //See http://bugzilla.gnome.org/show_bug.cgi?id=546730
+  Glib::RefPtr<Gio::Icon> get_icon();
+  Glib::RefPtr<const Gio::Icon> get_icon() const;
+  _IGNORE(gtk_status_icon_get_gicon)
+
   _WRAP_METHOD(int get_size() const, gtk_status_icon_get_size)
 
   _WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_status_icon_set_screen)
@@ -157,9 +165,12 @@
   _WRAP_PROPERTY("file", std::string)
   _WRAP_PROPERTY("stock", StockID)
   _WRAP_PROPERTY("icon-name", Glib::ustring)
+  _WRAP_PROPERTY("gicon", Glib::RefPtr<Gio::Icon>)
   _WRAP_PROPERTY("storage-type", ImageType)
   _WRAP_PROPERTY("size", int)
+  _WRAP_PROPERTY("screen", Glib::RefPtr<Gdk::Screen>)
   _WRAP_PROPERTY("blinking", bool)
+  _WRAP_PROPERTY("visible", bool)
 
   _WRAP_SIGNAL(bool size_changed(int size), size_changed)
 

Modified: trunk/tools/m4/convert_gtk.m4
==============================================================================
--- trunk/tools/m4/convert_gtk.m4	(original)
+++ trunk/tools/m4/convert_gtk.m4	Thu Aug  7 15:23:26 2008
@@ -623,6 +623,9 @@
 _CONVERSION(`const Glib::StringArrayHandle&',`const gchar**',`const_cast<const gchar**>(($3).data())')
 
 _CONVERSION(`const Glib::RefPtr<const Gio::Icon>&',`GIcon*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gio::Icon))
+_CONVERSION(`const Glib::RefPtr<const Gio::File>&',`GFile*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gio::File))
+_CONVERSION(`GFile*',`Glib::RefPtr<Gio::File>',`Glib::wrap($3)')
+_CONVERSION(`GFile*',`Glib::RefPtr<const Gio::File>',`Glib::wrap($3)')
 
 
 _CONVERSION(`GtkDragResult',`DragResult',`($2)$3')



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