[gtkmm/gtkmm-2-22] gtkmm: Added missing properties.

[Murray Cumming <murrayc src gnome org>]

commit 06f8af879fd9588ba18728523e58b41f0ded9024
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Sep 25 15:30:27 2010 +0200

    gtkmm: Added missing properties.
    
    	* tools/extra_defs_gen/generate_defs_gtk.cc: Added GtkComboBoxEntry and
    	GtkColorSelectionDialog.
    	* gtk/src/gtk_signals.defs: Added the new sections for these widgets.
    	* gtk/src/colorselection.hg: Added color_selection, ok_button, cancel_button,
    	and help_button properties.
    	* gtk/src/combobox.hg: Added popup_shown and button_sensitivity properties.
    	* gtk/src/comboboxentry.hg: Added text_column property.
    	* gtk/src/entry.hg: Added inner_borde, primary_icon_tooltip_text,
    	secondary_icon_tooltip_text", primary_icon_tooltip_markup" and
    	secondary_icon_tooltip_markup properties.
    	* gtk/src/filechooserbutton.hg: Added dialog property.
    	* gtk/src/handlebox.hg: Added snap_edge_set and child_detached properties.
    	* gtk/src/image.hg: Added pixel-size and icon-name properties.

 ChangeLog                                 |   18 +
 gtk/src/colorselection.hg                 |    5 +
 gtk/src/combobox.hg                       |    2 +
 gtk/src/comboboxentry.hg                  |    4 +-
 gtk/src/dialog.hg                         |    2 +
 gtk/src/entry.hg                          |    5 +
 gtk/src/filechooserbutton.hg              |    1 +
 gtk/src/frame.hg                          |    1 +
 gtk/src/gtk_signals.defs                  |  994 +++++++++++++++++++++++++++++
 gtk/src/handlebox.hg                      |    2 +
 gtk/src/iconview.hg                       |    2 +-
 gtk/src/image.hg                          |    2 +
 tools/extra_defs_gen/generate_defs_gtk.cc |    2 +
 13 files changed, 1038 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6bae763..830eb9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-25  Murray Cumming  <murrayc murrayc com>
+
+	gtkmm: Added missing properties.
+
+	* tools/extra_defs_gen/generate_defs_gtk.cc: Added GtkComboBoxEntry and 
+	GtkColorSelectionDialog.
+	* gtk/src/gtk_signals.defs: Added the new sections for these widgets.
+	* gtk/src/colorselection.hg: Added color_selection, ok_button, cancel_button, 
+	and help_button properties.
+	* gtk/src/combobox.hg: Added popup_shown and button_sensitivity properties.
+	* gtk/src/comboboxentry.hg: Added text_column property.
+	* gtk/src/entry.hg: Added inner_borde, primary_icon_tooltip_text, 
+	secondary_icon_tooltip_text", primary_icon_tooltip_markup" and 
+	secondary_icon_tooltip_markup properties.
+	* gtk/src/filechooserbutton.hg: Added dialog property.
+	* gtk/src/handlebox.hg: Added snap_edge_set and child_detached properties.
+	* gtk/src/image.hg: Added pixel-size and icon-name properties.
+
 2010-09-24  Murray Cumming  <murrayc murrayc com>
 
 	gtkmm: Added some more missing properties.
diff --git a/gtk/src/colorselection.hg b/gtk/src/colorselection.hg
index 9cb279e..a9efef0 100644
--- a/gtk/src/colorselection.hg
+++ b/gtk/src/colorselection.hg
@@ -126,6 +126,11 @@ _DEPRECATE_IFDEF_START
    */
   _MEMBER_GET_PTR(help_button,help_button,Button*,GtkWidget*)
 _DEPRECATE_IFDEF_END
+
+  _WRAP_PROPERTY("color-selection", ColorSelection*)
+  _WRAP_PROPERTY("ok-button", Button*)
+  _WRAP_PROPERTY("cancel-button", Button*)
+  _WRAP_PROPERTY("help-button", Button*)
 };
 
 } // namespace Gtk
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index 4329545..70cb923 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -154,6 +154,8 @@ public:
   _WRAP_PROPERTY("has-frame", bool)
   _WRAP_PROPERTY("focus-on-click", bool)
   _WRAP_PROPERTY("tearoff-title", Glib::ustring)
+  _WRAP_PROPERTY("popup-shown", bool)
+  _WRAP_PROPERTY("button-sensitivity", SensitivityType)
 
   /** The changed signal gets emitted when the active
    * item is changed. This can be due to the user selecting
diff --git a/gtk/src/comboboxentry.hg b/gtk/src/comboboxentry.hg
index a994d59..9508c31 100644
--- a/gtk/src/comboboxentry.hg
+++ b/gtk/src/comboboxentry.hg
@@ -97,7 +97,9 @@ public:
 
   /** @see Bin::get_child().
    */
-  const Entry* get_entry() const;                                      
+  const Entry* get_entry() const;   
+  
+  _WRAP_PROPERTY("text-column", int)                                   
 };
 
 
diff --git a/gtk/src/dialog.hg b/gtk/src/dialog.hg
index 20d9e5e..bac88db 100644
--- a/gtk/src/dialog.hg
+++ b/gtk/src/dialog.hg
@@ -124,6 +124,8 @@ public:
   _WRAP_PROPERTY("has_separator", bool)
 
   _WRAP_SIGNAL(void response(int response_id), "response")
+  
+  //_WRAP_PROPERTY("has-separator", bool) //deprecated.
 
   _IGNORE_SIGNAL("close")
 
diff --git a/gtk/src/entry.hg b/gtk/src/entry.hg
index b9e825a..3987fe4 100644
--- a/gtk/src/entry.hg
+++ b/gtk/src/entry.hg
@@ -207,6 +207,7 @@ public:
   _WRAP_PROPERTY("max-length", int)
   _WRAP_PROPERTY("visibility", bool)
   _WRAP_PROPERTY("has-frame", bool)
+  _WRAP_PROPERTY("inner-border", Border)
   _WRAP_PROPERTY("invisible-char", gunichar)
   _WRAP_PROPERTY("invisible-char-set", bool)
   _WRAP_PROPERTY("activates-default", bool)
@@ -235,6 +236,10 @@ public:
   _WRAP_PROPERTY("secondary-icon-activatable", bool)
   _WRAP_PROPERTY("primary-icon-sensitive", bool)
   _WRAP_PROPERTY("secondary-icon-sensitive", bool)
+  _WRAP_PROPERTY("primary-icon-tooltip-text", bool)
+  _WRAP_PROPERTY("secondary-icon-tooltip-text", bool)
+  _WRAP_PROPERTY("primary-icon-tooltip-markup", bool)
+  _WRAP_PROPERTY("secondary-icon-tooltip-markup", bool)
   _WRAP_PROPERTY("im-module", Glib::ustring)
 };
 
diff --git a/gtk/src/filechooserbutton.hg b/gtk/src/filechooserbutton.hg
index fd54f1f..ca4b533 100644
--- a/gtk/src/filechooserbutton.hg
+++ b/gtk/src/filechooserbutton.hg
@@ -95,6 +95,7 @@ public:
   //See http://bugzilla.gnome.org/show_bug.cgi?id=353196
   _WRAP_SIGNAL(void file_set(), "file-set", no_default_handler)
 
+  _WRAP_PROPERTY("dialog", FileChooserDialog*)
   _WRAP_PROPERTY("focus-on-click", bool)
   _WRAP_PROPERTY("title", Glib::ustring)                                          
   _WRAP_PROPERTY("width-chars", int)    
diff --git a/gtk/src/frame.hg b/gtk/src/frame.hg
index 9c6575e..bdb19d4 100644
--- a/gtk/src/frame.hg
+++ b/gtk/src/frame.hg
@@ -80,6 +80,7 @@ public:
   _WRAP_PROPERTY("label", Glib::ustring)
   _WRAP_PROPERTY("label-xalign", double)
   _WRAP_PROPERTY("label-yalign", double)
+  //deprecated: _WRAP_PROPERTY("shadow", ShadowType)
   _WRAP_PROPERTY("shadow-type", ShadowType)
   _WRAP_PROPERTY("label-widget", Widget*)
 
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index df8bf93..b32c5d4 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -10359,6 +10359,584 @@
   (construct-only #f)
 )
 
+;; From GtkColorSelectionDialog
+
+(define-property name
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamString")
+  (docs "The name of the widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property parent
+  (of-object "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is visible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sensitive
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget responds to input")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property app-paintable
+  (of-object "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget has the input focus")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property is-focus
+  (of-object "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is the default widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property receives-default
+  (of-object "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "Whether this widget has a tooltip")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property tooltip-markup
+  (of-object "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip for this widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property window
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property double-buffered
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property border-width
+  (of-object "GtkColorSelectionDialog")
+  (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 "GtkColorSelectionDialog")
+  (prop-type "GParamEnum")
+  (docs "Specify how resize events are handled")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property child
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamObject")
+  (docs "Can be used to add a new child to the container")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property type
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamEnum")
+  (docs "The type of the window")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property title
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamString")
+  (docs "The title of the window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property role
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamString")
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property resizable
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "If TRUE, users can resize the window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property modal
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "If TRUE, the window is modal (other windows are not usable while this one is up)")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property window-position
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamEnum")
+  (docs "The initial position of the window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property default-width
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamInt")
+  (docs "The default width of the window, used when initially showing the window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property default-height
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamInt")
+  (docs "The default height of the window, used when initially showing the window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property destroy-with-parent
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "If this window should be destroyed when the parent is destroyed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property icon
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamObject")
+  (docs "Icon for this window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property icon-name
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamString")
+  (docs "Name of the themed icon for this window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property screen
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamObject")
+  (docs "The screen where this window will be displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property type-hint
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamEnum")
+  (docs "Hint to help the desktop environment understand what kind of window this is and how to treat it.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property skip-taskbar-hint
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if the window should not be in the task bar.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property skip-pager-hint
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if the window should not be in the pager.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property urgency-hint
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if the window should be brought to the user's attention.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property accept-focus
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if the window should receive the input focus.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property focus-on-map
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "TRUE if the window should receive the input focus when mapped.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property decorated
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "Whether the window should be decorated by the window manager")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property deletable
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "Whether the window frame should have a close button")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property gravity
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamEnum")
+  (docs "The window gravity of the window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property transient-for
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamObject")
+  (docs "The transient parent of the dialog")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property opacity
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamDouble")
+  (docs "The opacity of the window, from 0 to 1")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property is-active
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "Whether the toplevel is the current active window")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property has-toplevel-focus
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "Whether the input focus is within this GtkWindow")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property startup-id
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamString")
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property mnemonics-visible
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamBoolean")
+  (docs "Whether mnemonics are currently visible in this window")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property color-selection
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamObject")
+  (docs "The color selection embedded in the dialog.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property ok-button
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamObject")
+  (docs "The OK button of the dialog.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property cancel-button
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamObject")
+  (docs "The cancel button of the dialog.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property help-button
+  (of-object "GtkColorSelectionDialog")
+  (prop-type "GParamObject")
+  (docs "The help button of the dialog.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GtkComboBox
 
 (define-signal popup
@@ -10739,6 +11317,422 @@
   (construct-only #f)
 )
 
+;; From GtkComboBoxEntry
+
+(define-property editing-canceled
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamBoolean")
+  (docs "Indicates that editing has been canceled")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property name
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamString")
+  (docs "The name of the widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property parent
+  (of-object "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is visible")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property sensitive
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget responds to input")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property app-paintable
+  (of-object "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget has the input focus")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property is-focus
+  (of-object "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is the default widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property receives-default
+  (of-object "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (prop-type "GParamBoolean")
+  (docs "Whether this widget has a tooltip")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property tooltip-markup
+  (of-object "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (prop-type "GParamString")
+  (docs "The contents of the tooltip for this widget")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property window
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamObject")
+  (docs "The widget's window if it is realized")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property double-buffered
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamBoolean")
+  (docs "Whether the widget is double buffered")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property halign
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra horizontal space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property valign
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamEnum")
+  (docs "How to position in extra vertical space")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-left
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the left side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-right
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the right side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-top
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the top side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin-bottom
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on the bottom side")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property margin
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamInt")
+  (docs "Pixels of extra space on all four sides")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property border-width
+  (of-object "GtkComboBoxEntry")
+  (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 "GtkComboBoxEntry")
+  (prop-type "GParamEnum")
+  (docs "Specify how resize events are handled")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property child
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamObject")
+  (docs "Can be used to add a new child to the container")
+  (readable #f)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property model
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamObject")
+  (docs "The model for the combo box")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property wrap-width
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamInt")
+  (docs "Wrap width for laying out the items in a grid")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property row-span-column
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamInt")
+  (docs "TreeModel column containing the row span values")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property column-span-column
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamInt")
+  (docs "TreeModel column containing the column span values")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property active
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamInt")
+  (docs "The item which is currently active")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property add-tearoffs
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamBoolean")
+  (docs "Whether dropdowns should have a tearoff menu item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property tearoff-title
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamString")
+  (docs "A title that may be displayed by the window manager when the popup is torn-off")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property has-frame
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamBoolean")
+  (docs "Whether the combo box draws a frame around the child")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property focus-on-click
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamBoolean")
+  (docs "Whether the combo box grabs focus when it is clicked with the mouse")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property popup-shown
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamBoolean")
+  (docs "Whether the combo's dropdown is shown")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property button-sensitivity
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamEnum")
+  (docs "Whether the dropdown button is sensitive when the model is empty")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property text-column
+  (of-object "GtkComboBoxEntry")
+  (prop-type "GParamInt")
+  (docs "A column in the data source model to get the strings from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkContainer
 
 (define-signal add
diff --git a/gtk/src/handlebox.hg b/gtk/src/handlebox.hg
index 6b313f5..a0095d6 100644
--- a/gtk/src/handlebox.hg
+++ b/gtk/src/handlebox.hg
@@ -90,6 +90,8 @@ _DEPRECATE_IFDEF_END
   _WRAP_PROPERTY("shadow-type", ShadowType)
   _WRAP_PROPERTY("handle-position", PositionType)
   _WRAP_PROPERTY("snap-edge", PositionType)
+  _WRAP_PROPERTY("snap-edge-set", bool)
+  _WRAP_PROPERTY("child-detached", bool)
 };
 
 } /* namespace Gtk */
diff --git a/gtk/src/iconview.hg b/gtk/src/iconview.hg
index 42fc525..97f06f0 100644
--- a/gtk/src/iconview.hg
+++ b/gtk/src/iconview.hg
@@ -410,7 +410,7 @@ public:
   _WRAP_PROPERTY("markup-column", int)
   _WRAP_PROPERTY("tooltip-column", int)
   _WRAP_PROPERTY("selection-mode", SelectionMode)
-  _WRAP_PROPERTY("orientation", Orientation)
+  _WRAP_PROPERTY("orientation", Orientation) //deprecated
   _WRAP_PROPERTY("item-orientation", Orientation)
   _WRAP_PROPERTY("reorderable", bool)
   _WRAP_PROPERTY("model", Glib::RefPtr<TreeModel>)
diff --git a/gtk/src/image.hg b/gtk/src/image.hg
index d509b88..9856fa6 100644
--- a/gtk/src/image.hg
+++ b/gtk/src/image.hg
@@ -174,7 +174,9 @@ public:
   _WRAP_PROPERTY("stock", Glib::ustring)
   _WRAP_PROPERTY("icon-set", Gtk::IconSet)
   _WRAP_PROPERTY("icon-size", int)
+  _WRAP_PROPERTY("pixel-size", int)
   _WRAP_PROPERTY("pixbuf-animation", Glib::RefPtr<Gdk::PixbufAnimation>)
+  _WRAP_PROPERTY("icon-name", Glib::ustring)
   _WRAP_PROPERTY("storage-type", ImageType)
   _WRAP_PROPERTY("gicon", Glib::RefPtr<Gio::Icon>)
 };
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index 6899117..c70c9ee 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -88,8 +88,10 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_CLIPBOARD )
             << get_defs( GTK_TYPE_COLOR_BUTTON )
             << get_defs( GTK_TYPE_COLOR_SELECTION )
+            << get_defs( GTK_TYPE_COLOR_SELECTION_DIALOG )
             << get_defs( GTK_TYPE_COMBO ) /* Deprecated */
             << get_defs( GTK_TYPE_COMBO_BOX )
+            << get_defs( GTK_TYPE_COMBO_BOX_ENTRY )
             << get_defs( GTK_TYPE_CONTAINER )
             << get_defs( GTK_TYPE_CTREE ) /* Deprecated */
             << get_defs( GTK_TYPE_CELL_VIEW )