gtkmm r1093 - in trunk: . gtk/gtkmm gtk/src tools/extra_defs_gen



Author: murrayc
Date: Sun Feb  8 14:36:41 2009
New Revision: 1093
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1093&view=rev

Log:
2009-02-08  Murray Cumming  <murrayc murrayc com>h>

* gtk/gtkmm/stock.[h|cc]: Added CAPS_LOCK_WARNING.

* tools/extra_defs_gen/generate_defs_gtk.cc: Added new interfaces.
* gtk/src/gtk_signals.defs: Regenerated.

* gtk/src/Makefile_list_of_hg.am_fragment:
* gtk/src/gtk_vfuncs.defs:
* gtk/src/activatable.[hg|ccg]:
* gtk/src/orientation.[hg|ccg]: Added the new interfaces, though 
we cannot use them yet without breaking ABI.
* gtk/src/box.hg:
* gtk/src/button.hg:
* gtk/src/buttonbox.hg:
* gtk/src/menu.hg:
* gtk/src/menuitem.hg:
* gtk/src/paned.hg:
* gtk/src/recentchoosermenu.hg:
* gtk/src/ruler.hg:
* gtk/src/scalebutton.hg:
* gtk/src/scrollbar.hg:
* gtk/src/separator.hg:
* gtk/src/toolbutton.hg: Added TODOs about deriving from the new 
interfaces when we can break ABI. I only did this for base classes, 
though GTK+ does it for further derived classes too, for some reason.

Added:
   trunk/gtk/src/activatable.ccg   (contents, props changed)
      - copied, changed from r1092, /trunk/gtk/src/editable.ccg
   trunk/gtk/src/activatable.hg   (contents, props changed)
      - copied, changed from r1092, /trunk/gtk/src/editable.hg
   trunk/gtk/src/orientable.ccg   (contents, props changed)
      - copied, changed from r1092, /trunk/gtk/src/editable.ccg
   trunk/gtk/src/orientable.hg   (contents, props changed)
      - copied, changed from r1092, /trunk/gtk/src/editable.hg
Modified:
   trunk/ChangeLog
   trunk/gtk/gtkmm/stock.cc
   trunk/gtk/gtkmm/stock.h
   trunk/gtk/src/Makefile_list_of_hg.am_fragment
   trunk/gtk/src/box.hg
   trunk/gtk/src/button.hg
   trunk/gtk/src/buttonbox.hg
   trunk/gtk/src/gtk_signals.defs
   trunk/gtk/src/gtk_vfuncs.defs
   trunk/gtk/src/menu.hg
   trunk/gtk/src/menuitem.hg
   trunk/gtk/src/paned.hg
   trunk/gtk/src/recentchoosermenu.hg
   trunk/gtk/src/ruler.hg
   trunk/gtk/src/scalebutton.hg
   trunk/gtk/src/scrollbar.hg
   trunk/gtk/src/separator.hg
   trunk/gtk/src/toolbutton.hg
   trunk/tools/extra_defs_gen/generate_defs_gtk.cc

Modified: trunk/gtk/gtkmm/stock.cc
==============================================================================
--- trunk/gtk/gtkmm/stock.cc	(original)
+++ trunk/gtk/gtkmm/stock.cc	Sun Feb  8 14:36:41 2009
@@ -46,6 +46,7 @@
 const Gtk::BuiltinStockID APPLY= { GTK_STOCK_APPLY };
 const Gtk::BuiltinStockID BOLD= { GTK_STOCK_BOLD };
 const Gtk::BuiltinStockID CANCEL = { GTK_STOCK_CANCEL };
+const Gtk::BuiltinStockID CAPS_LOCK_WARNING = { GTK_STOCK_CAPS_LOCK_WARNING };
 const Gtk::BuiltinStockID CDROM = { GTK_STOCK_CDROM };
 const Gtk::BuiltinStockID CLEAR = { GTK_STOCK_CLEAR };
 const Gtk::BuiltinStockID CLOSE = { GTK_STOCK_CLOSE };

Modified: trunk/gtk/gtkmm/stock.h
==============================================================================
--- trunk/gtk/gtkmm/stock.h	(original)
+++ trunk/gtk/gtkmm/stock.h	Sun Feb  8 14:36:41 2009
@@ -69,6 +69,7 @@
 extern GTKMM_API const Gtk::BuiltinStockID APPLY;            /*!< @image html gtk-apply.png               */
 extern GTKMM_API const Gtk::BuiltinStockID BOLD;             /*!< @image html gtk-bold.png           */
 extern GTKMM_API const Gtk::BuiltinStockID CANCEL;           /*!< @image html gtk-cancel.png              */
+extern GTKMM_API const Gtk::BuiltinStockID CAPS_LOCK_WARNING; /*!< @image html gtk-caps-lock-warning.png  */
 extern GTKMM_API const Gtk::BuiltinStockID CDROM;            /*!< @image html gtk-cdrom.png               */
 extern GTKMM_API const Gtk::BuiltinStockID CLEAR;            /*!< @image html gtk-clear.png               */
 extern GTKMM_API const Gtk::BuiltinStockID CLOSE;            /*!< @image html gtk-close.png               */

Modified: trunk/gtk/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- trunk/gtk/src/Makefile_list_of_hg.am_fragment	(original)
+++ trunk/gtk/src/Makefile_list_of_hg.am_fragment	Sun Feb  8 14:36:41 2009
@@ -5,7 +5,7 @@
 files_posix_hg = pagesetupunixdialog.hg printunixdialog.hg \
 	printer.hg printjob.hg
 files_win32_hg =
-files_general_hg = aboutdialog.hg accelgroup.hg accellabel.hg action.hg actiongroup.hg adjustment.hg alignment.hg \
+files_general_hg = aboutdialog.hg accelgroup.hg accellabel.hg action.hg actiongroup.hg activatable.hg adjustment.hg alignment.hg \
           arrow.hg aspectframe.hg assistant.hg \
           bin.hg box.hg builder.hg button.hg buttonbox.hg \
           calendar.hg celleditable.hg celllayout.hg cellview.hg \
@@ -20,7 +20,7 @@
           iconfactory.hg iconset.hg iconsource.hg iconinfo.hg icontheme.hg iconview.hg image.hg imagemenuitem.hg inputdialog.hg invisible.hg item.hg \
           label.hg layout.hg linkbutton.hg liststore.hg \
           main.hg menu.hg menubar.hg menuitem.hg menushell.hg menutoolbutton.hg messagedialog.hg misc.hg \
-          notebook.hg object.hg optionmenu.hg \
+          notebook.hg object.hg optionmenu.hg orientable.hg \
           paned.hg plug.hg progressbar.hg \
 	  papersize.hg pagesetup.hg printsettings.hg printcontext.hg printoperation.hg printoperationpreview.hg \
 	  radioaction.hg radiobutton.hg radiomenuitem.hg radiotoolbutton.hg range.hg rc.hg \

Copied: trunk/gtk/src/activatable.ccg (from r1092, /trunk/gtk/src/editable.ccg)
==============================================================================
--- /trunk/gtk/src/editable.ccg	(original)
+++ trunk/gtk/src/activatable.ccg	Sun Feb  8 14:36:41 2009
@@ -1,7 +1,7 @@
 // -*- c++ -*-
-/* $Id: editable.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
+/* $Id: activatable.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
 
-/* Copyright 1998-2002 The gtkmm Development Team
+/* Copyright 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Copied: trunk/gtk/src/activatable.hg (from r1092, /trunk/gtk/src/editable.hg)
==============================================================================
--- /trunk/gtk/src/editable.hg	(original)
+++ trunk/gtk/src/activatable.hg	Sun Feb  8 14:36:41 2009
@@ -1,6 +1,6 @@
-/* $Id: editable.hg,v 1.3 2006/05/18 17:53:15 murrayc Exp $ */
+/* $Id: activatable.hg,v 1.3 2006/05/18 17:53:15 murrayc Exp $ */
 
-/* Copyright (C) 1998-2002 The gtkmm Development Team
+/* Copyright (C) 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,6 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <gtkmm/action.h>
 #include <glibmm/interface.h>
 #include <gtk/gtk.h>
 _DEFS(gtkmm,gtk)
@@ -26,109 +27,31 @@
 namespace Gtk
 {
 
-/** Base class for text-editing widgets.
- *
- * The Gtk::Editable class is a base class for widgets for editing text,
- * such as Gtk::Entry. It cannot be instantiated by itself. The editable
- * class contains functions for generically manipulating an editable widget,
- * a large number of action signals used for key bindings, and several
- * signals that an application can connect to to modify the behavior of a
- * widget.
+/** Activatable widgets can be connected to a GtkAction and reflect the state 
+ * of the action. An Activatable can also provide feedback through its action, 
+ * as it is responsible for activating the related action.
  *
+ * @newin2p16
  */
-class Editable : public Glib::Interface
+class Activatable : public Glib::Interface
 {
-  _CLASS_INTERFACE(Editable,GtkEditable,GTK_EDITABLE,GtkEditableClass)
+  _CLASS_INTERFACE(Activatable, GtkActivatable, GTK_ACTIVATABLE, GtkActivatableIface)
 
 public:
-  _WRAP_METHOD(void cut_clipboard(), gtk_editable_cut_clipboard)
-  _WRAP_METHOD(void copy_clipboard(), gtk_editable_copy_clipboard)
-  _WRAP_METHOD(void paste_clipboard(), gtk_editable_paste_clipboard)
-  _WRAP_METHOD(void delete_selection(), gtk_editable_delete_selection)
-  _WRAP_METHOD(void set_editable(bool is_editable = true), gtk_editable_set_editable)
-  _WRAP_METHOD(bool get_editable() const, gtk_editable_get_editable)
-
-  _WRAP_METHOD(void insert_text(const Glib::ustring& text, int length, int& position), gtk_editable_insert_text)
-  _WRAP_METHOD(void delete_text(int start_pos, int end_pos), gtk_editable_delete_text)
-
-  _WRAP_METHOD(Glib::ustring get_chars(int start_pos, int end_pos) const, gtk_editable_get_chars)
-
-  _WRAP_METHOD(void select_region(int start_pos, int end_pos), gtk_editable_select_region)
-  _WRAP_METHOD(bool get_selection_bounds(int& start_pos, int& end_pos) const, gtk_editable_get_selection_bounds)
-
-  _WRAP_METHOD(void set_position(int position), gtk_editable_set_position)
-  _WRAP_METHOD(int get_position() const, gtk_editable_get_position)
-
-  _IGNORE_SIGNAL(insert_text)
-
-#m4begin
-dnl // WRAP_SIGNAL "insert_text"
-dnl // C++ prototype: void insert_text(const Glib::ustring& text, int* position)
-dnl // C prototype: void insert_text(const gchar* text, gint length, gint* position)
-
-  _SIGNAL_PROXY(
-      insert_text, void, `const gchar* text, gint length, gint* position',
-      insert_text, void, `const Glib::ustring&, int*',dnl // C++ prototype
-      `Glib::ustring(text, text + length), position',`dnl // C -> C++ conversion
-      /**
-       * @param const Glib::ustring& text
-       * @param int* position
-       * @return void
-       */')
-
-  _SIGNAL_H(insert_text, void, `const Glib::ustring& text, int* position')
-  _SIGNAL_PH(insert_text, void, `GtkEditable* self, const gchar* text, gint length, gint* position')
-
-  _SIGNAL_CC(
-      insert_text, insert_text, void, void,
-      `const Glib::ustring& text, int* position',dnl // C++ arguments
-      `text.data(), text.bytes(), position')dnl // C++ -> C conversion
-
-  _SIGNAL_PCC(
-      insert_text, insert_text, void, void,
-      `GtkEditable* self, const gchar* text, gint length, gint* position',dnl // C arguments
-      `self, text, length, position',dnl // C argument names
-      `Glib::ustring(text, text + length), position',dnl // C -> C++ conversion
-      self)
-#m4end
-
-  _WRAP_SIGNAL(void delete_text(int start_pos, int end_pos), "delete_text")
-  _WRAP_SIGNAL(void changed(), "changed")
-
-protected:
-
-#m4begin
-dnl // WRAP_VFUNC "do_insert_text"
-dnl // C++ prototype: void insert_text_vfunc(const Glib::ustring& text, int& position)
-dnl // C prototype: void do_insert_text(const gchar* text, gint length, gint* position)
-
-  _VFUNC_H(insert_text_vfunc, void, `const Glib::ustring& text, int& position')
-  _VFUNC_PH(do_insert_text, void, `GtkEditable* self, const gchar* text, gint length, gint* position')
-  _VFUNC_CC(
-      insert_text_vfunc, do_insert_text, void, void,
-      `const Glib::ustring& text, int& position',dnl // C++ arguments
-      `text.data(), text.bytes(), &position')dnl // C++ -> C conversion
-  _VFUNC_PCC(
-      insert_text_vfunc, do_insert_text, void, void,
-      `GtkEditable* self, const gchar* text, gint length, gint* position',dnl // C arguments
-      `self, text, length, position',dnl // C argument names
-      `Glib::ustring(text, text + length), *position',dnl // C -> C++ conversion
-      self)
-#m4end
-
-  _WRAP_VFUNC(void delete_text(int start_pos, int end_pos), do_delete_text)
-
-#m4begin
-dnl // This special conversion is not in convert_gtk.m4, because allocating a new
-dnl // string is rarely needed -- probably not a good idea to make this generic.
-  _CONVERSION(`Glib::ustring', `gchar*', `g_strdup(($3).c_str())')
-#m4end
-  _WRAP_VFUNC(Glib::ustring get_chars(int start_pos, int end_pos) const, get_chars)
-
-  _WRAP_VFUNC(void select_region(int start_pos, int end_pos), set_selection_bounds)
-  _WRAP_VFUNC(bool get_selection_bounds(int& start_pos, int& end_pos) const, get_selection_bounds)
-  _WRAP_VFUNC(void set_position(int position), set_position)
-  _WRAP_VFUNC(int get_position() const, get_position)
+  _WRAP_METHOD(void do_set_related_action(const Glib::RefPtr<Action>& action), gtk_activatable_do_set_related_action)
+  _WRAP_METHOD(Glib::RefPtr<Action> get_related_action(), gtk_activatable_get_related_action, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Action> get_related_action() const, gtk_activatable_get_related_action, refreturn, constversion)
+  _WRAP_METHOD(bool get_use_action_appearance() const, gtk_activatable_get_use_action_appearance)
+  _WRAP_METHOD(void reset(const Glib::RefPtr<Action>& action), gtk_activatable_reset)
+  _WRAP_METHOD(void set_related_action(const Glib::RefPtr<Action>& action), gtk_activatable_set_related_action)
+  _WRAP_METHOD(void set_use_action_appearance(bool use_appearance = true), gtk_activatable_set_use_action_appearance)
+
+  _WRAP_PROPERTY("related-action", Glib::RefPtr<Action>)
+  _WRAP_PROPERTY("use-action-appearance", bool)
+
+#m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
+  _WRAP_VFUNC(void update(const Glib::RefPtr<Action>& action, const Glib::ustring& property_name), update)
+  _WRAP_VFUNC(void reset(const Glib::RefPtr<Action>& action), reset)
 };
 
 } // namespace Gtk

Modified: trunk/gtk/src/box.hg
==============================================================================
--- trunk/gtk/src/box.hg	(original)
+++ trunk/gtk/src/box.hg	Sun Feb  8 14:36:41 2009
@@ -121,7 +121,9 @@
 } /* namespace Box_Helpers */
 
 
-/** A base class for box containers
+//TODO: Inherit/Implement Orientation when we can break ABI.
+
+/** A base class for box containers.
  *
  * Abstract base class for horizontal and vertical boxes, which organize a
  * variable number of widgets into a rectangular area.  This is an abstract

Modified: trunk/gtk/src/button.hg
==============================================================================
--- trunk/gtk/src/button.hg	(original)
+++ trunk/gtk/src/button.hg	Sun Feb  8 14:36:41 2009
@@ -30,6 +30,7 @@
 
 namespace Stock { struct BuiltinStockID; }
 
+// TODO: Inherit/Implement Activatable when we can break ABI.
 
 /** A widget that creates a signal when clicked on.
  *

Modified: trunk/gtk/src/buttonbox.hg
==============================================================================
--- trunk/gtk/src/buttonbox.hg	(original)
+++ trunk/gtk/src/buttonbox.hg	Sun Feb  8 14:36:41 2009
@@ -31,6 +31,8 @@
 enum { BUTTONBOX_DEFAULT = -1 };
 
 
+//TODO: Inherit/Implement Orientation when we can break ABI.
+
 /** Base class for Gtk::HButtonBox and Gtk::VButtonBox
  *
  * A button box should be used to provide a consistent layout of buttons

Modified: trunk/gtk/src/gtk_signals.defs
==============================================================================
--- trunk/gtk/src/gtk_signals.defs	(original)
+++ trunk/gtk/src/gtk_signals.defs	Sun Feb  8 14:36:41 2009
@@ -840,20 +840,20 @@
   (construct-only #f)
 )
 
-(define-property startup-id
+(define-property role
   (of-object "GtkAboutDialog")
   (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property role
+(define-property startup-id
   (of-object "GtkAboutDialog")
   (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
@@ -1886,6 +1886,26 @@
   (construct-only #f)
 )
 
+;; From GtkActivatable
+
+(define-property related-action
+  (of-object "GtkActivatable")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkActivatable")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkAdjustment
 
 (define-signal value-changed
@@ -3141,20 +3161,20 @@
   (construct-only #f)
 )
 
-(define-property startup-id
+(define-property role
   (of-object "GtkAssistant")
   (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property role
+(define-property startup-id
   (of-object "GtkAssistant")
   (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
@@ -3923,6 +3943,24 @@
   (when "first")
 )
 
+(define-property related-action
+  (of-object "GtkButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkButton")
   (prop-type "GParamPointer")
@@ -4853,6 +4891,24 @@
 
 ;; From GtkCheckButton
 
+(define-property related-action
+  (of-object "GtkCheckButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkCheckButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkCheckButton")
   (prop-type "GParamPointer")
@@ -5203,6 +5259,24 @@
   (when "first")
 )
 
+(define-property related-action
+  (of-object "GtkCheckMenuItem")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkCheckMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkCheckMenuItem")
   (prop-type "GParamPointer")
@@ -9266,6 +9340,24 @@
   (when "first")
 )
 
+(define-property related-action
+  (of-object "GtkColorButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkColorButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkColorButton")
   (prop-type "GParamPointer")
@@ -12055,20 +12147,20 @@
   (construct-only #f)
 )
 
-(define-property startup-id
+(define-property role
   (of-object "GtkDialog")
   (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property role
+(define-property startup-id
   (of-object "GtkDialog")
   (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
@@ -12507,6 +12599,35 @@
   (construct-only #f)
 )
 
+;; From GtkEditable
+
+(define-signal changed
+  (of-object "GtkEditable")
+  (return-type "void")
+  (when "last")
+)
+
+(define-signal insert-text
+  (of-object "GtkEditable")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("const-gchar*" "p0")
+    '("gint" "p1")
+    '("gpointer" "p2")
+  )
+)
+
+(define-signal delete-text
+  (of-object "GtkEditable")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+    '("gint" "p1")
+  )
+)
+
 ;; From GtkEntry
 
 (define-signal activate
@@ -12976,7 +13097,7 @@
 (define-property caps-lock-warning
   (of-object "GtkEntry")
   (prop-type "GParamBoolean")
-  (docs "Whether password entries will show a warning when Caps Lock is on or an input method is active")
+  (docs "Whether password entries will show a warning when Caps Lock is on")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -13852,109 +13973,109 @@
   (when "first")
 )
 
-(define-property select-multiple
+(define-property preview-widget
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for custom previews.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property local-only
+(define-property action
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether the selected file(s) should be limited to local file: URLs")
+  (prop-type "GParamEnum")
+  (docs "The type of operation that the file selector is performing")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-preview-label
+(define-property filter
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamBoolean")
-  (docs "Whether to display a stock label with the name of the previewed file.")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which files are displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property file-system-backend
+(define-property show-hidden
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamString")
-  (docs "Name of file system backend to use")
-  (readable #f)
+  (prop-type "GParamBoolean")
+  (docs "Whether the hidden files and folders should be displayed")
+  (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property do-overwrite-confirmation
+(define-property preview-widget-active
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
-  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
+  (docs "Whether the application supplied widget for custom previews should be shown.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget
+(define-property file-system-backend
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for custom previews.")
-  (readable #t)
+  (prop-type "GParamString")
+  (docs "Name of file system backend to use")
+  (readable #f)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-(define-property action
+(define-property extra-widget
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamEnum")
-  (docs "The type of operation that the file selector is performing")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for extra options.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget-active
+(define-property select-multiple
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
-  (docs "Whether the application supplied widget for custom previews should be shown.")
+  (docs "Whether to allow multiple files to be selected")
   (readable #t)
   (writable #t)
   (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 orientation
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which files are displayed")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property orientation
+(define-property do-overwrite-confirmation
   (of-object "GtkFileChooserButton")
-  (prop-type "GParamEnum")
-  (docs "The orientation of the orientable")
+  (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 show-hidden
+(define-property use-preview-label
   (of-object "GtkFileChooserButton")
   (prop-type "GParamBoolean")
-  (docs "Whether the hidden files and folders should be displayed")
+  (docs "Whether to display a stock label with the name of the previewed file.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14250,100 +14371,100 @@
 
 ;; From GtkFileChooserDialog
 
-(define-property select-multiple
+(define-property preview-widget
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for custom previews.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property local-only
+(define-property action
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether the selected file(s) should be limited to local file: URLs")
+  (prop-type "GParamEnum")
+  (docs "The type of operation that the file selector is performing")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-preview-label
+(define-property filter
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamBoolean")
-  (docs "Whether to display a stock label with the name of the previewed file.")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which files are displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property file-system-backend
+(define-property show-hidden
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamString")
-  (docs "Name of file system backend to use")
-  (readable #f)
+  (prop-type "GParamBoolean")
+  (docs "Whether the hidden files and folders should be displayed")
+  (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property do-overwrite-confirmation
+(define-property preview-widget-active
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
+  (docs "Whether the application supplied widget for custom previews should be shown.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget
+(define-property file-system-backend
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for custom previews.")
-  (readable #t)
+  (prop-type "GParamString")
+  (docs "Name of file system backend to use")
+  (readable #f)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-(define-property action
+(define-property extra-widget
   (of-object "GtkFileChooserDialog")
-  (prop-type "GParamEnum")
-  (docs "The type of operation that the file selector is performing")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for extra options.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget-active
+(define-property select-multiple
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether the application supplied widget for custom previews should be shown.")
+  (docs "Whether to allow multiple files to be selected")
   (readable #t)
   (writable #t)
   (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 show-hidden
+(define-property use-preview-label
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamBoolean")
-  (docs "Whether the hidden files and folders should be displayed")
+  (docs "Whether to display a stock label with the name of the previewed file.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -14601,20 +14722,20 @@
   (construct-only #f)
 )
 
-(define-property startup-id
+(define-property role
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property role
+(define-property startup-id
   (of-object "GtkFileChooserDialog")
   (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
@@ -14846,109 +14967,109 @@
 
 ;; From GtkFileChooserWidget
 
-(define-property select-multiple
+(define-property preview-widget
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple files to be selected")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for custom previews.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property local-only
+(define-property action
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether the selected file(s) should be limited to local file: URLs")
+  (prop-type "GParamEnum")
+  (docs "The type of operation that the file selector is performing")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property use-preview-label
+(define-property filter
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamBoolean")
-  (docs "Whether to display a stock label with the name of the previewed file.")
+  (prop-type "GParamObject")
+  (docs "The current filter for selecting which files are displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property file-system-backend
+(define-property show-hidden
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamString")
-  (docs "Name of file system backend to use")
-  (readable #f)
+  (prop-type "GParamBoolean")
+  (docs "Whether the hidden files and folders should be displayed")
+  (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property do-overwrite-confirmation
+(define-property preview-widget-active
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether a file chooser in save mode will present an overwrite confirmation dialog if necessary.")
+  (docs "Whether the application supplied widget for custom previews should be shown.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget
+(define-property file-system-backend
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamObject")
-  (docs "Application supplied widget for custom previews.")
-  (readable #t)
+  (prop-type "GParamString")
+  (docs "Name of file system backend to use")
+  (readable #f)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-(define-property action
+(define-property extra-widget
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamEnum")
-  (docs "The type of operation that the file selector is performing")
+  (prop-type "GParamObject")
+  (docs "Application supplied widget for extra options.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property preview-widget-active
+(define-property select-multiple
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether the application supplied widget for custom previews should be shown.")
+  (docs "Whether to allow multiple files to be selected")
   (readable #t)
   (writable #t)
   (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 orientation
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamObject")
-  (docs "The current filter for selecting which files are displayed")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property orientation
+(define-property do-overwrite-confirmation
   (of-object "GtkFileChooserWidget")
-  (prop-type "GParamEnum")
-  (docs "The orientation of the orientable")
+  (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 show-hidden
+(define-property use-preview-label
   (of-object "GtkFileChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether the hidden files and folders should be displayed")
+  (docs "Whether to display a stock label with the name of the previewed file.")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -15460,20 +15581,20 @@
   (construct-only #f)
 )
 
-(define-property startup-id
+(define-property role
   (of-object "GtkFileSelection")
   (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property role
+(define-property startup-id
   (of-object "GtkFileSelection")
   (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
@@ -15974,6 +16095,24 @@
   (when "first")
 )
 
+(define-property related-action
+  (of-object "GtkFontButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkFontButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkFontButton")
   (prop-type "GParamPointer")
@@ -16887,20 +17026,20 @@
   (construct-only #f)
 )
 
-(define-property startup-id
+(define-property role
   (of-object "GtkFontSelectionDialog")
   (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property role
+(define-property startup-id
   (of-object "GtkFontSelectionDialog")
   (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
@@ -18100,6 +18239,24 @@
 
 ;; From GtkImageMenuItem
 
+(define-property related-action
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkImageMenuItem")
   (prop-type "GParamPointer")
@@ -18406,6 +18563,15 @@
   (construct-only #f)
 )
 
+(define-property always-show-image
+  (of-object "GtkImageMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether the image will always be shown")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkInputDialog
 
 (define-signal enable-device
@@ -18678,20 +18844,20 @@
   (construct-only #f)
 )
 
-(define-property startup-id
+(define-property role
   (of-object "GtkInputDialog")
   (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property role
+(define-property startup-id
   (of-object "GtkInputDialog")
   (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
@@ -20537,6 +20703,24 @@
 
 ;; From GtkLinkButton
 
+(define-property related-action
+  (of-object "GtkLinkButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkLinkButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkLinkButton")
   (prop-type "GParamPointer")
@@ -22060,6 +22244,24 @@
   )
 )
 
+(define-property related-action
+  (of-object "GtkMenuItem")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkMenuItem")
   (prop-type "GParamPointer")
@@ -22646,6 +22848,24 @@
   (when "first")
 )
 
+(define-property related-action
+  (of-object "GtkMenuToolButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkMenuToolButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkMenuToolButton")
   (prop-type "GParamPointer")
@@ -23224,20 +23444,20 @@
   (construct-only #f)
 )
 
-(define-property startup-id
+(define-property role
   (of-object "GtkMessageDialog")
   (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property role
+(define-property startup-id
   (of-object "GtkMessageDialog")
   (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
@@ -24241,6 +24461,24 @@
   (when "last")
 )
 
+(define-property related-action
+  (of-object "GtkOptionMenu")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkOptionMenu")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkOptionMenu")
   (prop-type "GParamPointer")
@@ -24565,6 +24803,17 @@
   (construct-only #f)
 )
 
+;; From GtkOrientable
+
+(define-property orientation
+  (of-object "GtkOrientable")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GtkPaned
 
 (define-signal cycle-child-focus
@@ -25396,20 +25645,20 @@
   (construct-only #f)
 )
 
-(define-property startup-id
+(define-property role
   (of-object "GtkPlug")
   (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property role
+(define-property startup-id
   (of-object "GtkPlug")
   (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
@@ -26521,20 +26770,20 @@
   (construct-only #f)
 )
 
-(define-property startup-id
+(define-property role
   (of-object "GtkPageSetupUnixDialog")
   (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property role
+(define-property startup-id
   (of-object "GtkPageSetupUnixDialog")
   (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
@@ -27018,20 +27267,20 @@
   (construct-only #f)
 )
 
-(define-property startup-id
+(define-property role
   (of-object "GtkPrintUnixDialog")
   (prop-type "GParamString")
-  (docs "Unique startup identifier for the window used by startup-notification")
-  (readable #f)
+  (docs "Unique identifier for the window to be used when restoring a session")
+  (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property role
+(define-property startup-id
   (of-object "GtkPrintUnixDialog")
   (prop-type "GParamString")
-  (docs "Unique identifier for the window to be used when restoring a session")
-  (readable #t)
+  (docs "Unique startup identifier for the window used by startup-notification")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
@@ -27885,6 +28134,24 @@
   (when "first")
 )
 
+(define-property related-action
+  (of-object "GtkRadioButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkRadioButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkRadioButton")
   (prop-type "GParamPointer")
@@ -28238,6 +28505,24 @@
 
 ;; From GtkRadioToolButton
 
+(define-property related-action
+  (of-object "GtkRadioToolButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkRadioToolButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkRadioToolButton")
   (prop-type "GParamPointer")
@@ -28770,6 +29055,24 @@
   (when "first")
 )
 
+(define-property related-action
+  (of-object "GtkRadioMenuItem")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkRadioMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkRadioMenuItem")
   (prop-type "GParamPointer")
@@ -29411,15 +29714,6 @@
 
 ;; From GtkRecentAction
 
-(define-property local-only
-  (of-object "GtkRecentAction")
-  (prop-type "GParamBoolean")
-  (docs "Whether the selected resource(s) should be limited to local file: URIs")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property limit
   (of-object "GtkRecentAction")
   (prop-type "GParamInt")
@@ -29429,10 +29723,10 @@
   (construct-only #f)
 )
 
-(define-property show-tips
+(define-property local-only
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether there should be a tooltip on the item")
+  (docs "Whether the selected resource(s) should be limited to local file: URIs")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29447,10 +29741,19 @@
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property show-not-found
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
+  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(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)
@@ -29465,37 +29768,37 @@
   (construct-only #t)
 )
 
-(define-property show-private
+(define-property show-tips
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether the private items should be displayed")
+  (docs "Whether there should be a tooltip on the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-not-found
+(define-property show-private
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-icons
+(define-property select-multiple
   (of-object "GtkRecentAction")
   (prop-type "GParamBoolean")
-  (docs "Whether there should be an icon near the item")
+  (docs "Whether to allow multiple items to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property sort-type
+(define-property show-icons
   (of-object "GtkRecentAction")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether there should be an icon near the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29659,15 +29962,6 @@
   (when "last")
 )
 
-(define-property local-only
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamBoolean")
-  (docs "Whether the selected resource(s) should be limited to local file: URIs")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
 (define-property limit
   (of-object "GtkRecentChooser")
   (prop-type "GParamInt")
@@ -29677,10 +29971,10 @@
   (construct-only #f)
 )
 
-(define-property show-tips
+(define-property local-only
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether there should be a tooltip on the item")
+  (docs "Whether the selected resource(s) should be limited to local file: URIs")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29695,10 +29989,19 @@
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property show-not-found
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
+  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(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)
@@ -29713,6 +30016,15 @@
   (construct-only #t)
 )
 
+(define-property show-tips
+  (of-object "GtkRecentChooser")
+  (prop-type "GParamBoolean")
+  (docs "Whether there should be a tooltip on the item")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property show-private
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
@@ -29722,10 +30034,10 @@
   (construct-only #f)
 )
 
-(define-property show-not-found
+(define-property select-multiple
   (of-object "GtkRecentChooser")
   (prop-type "GParamBoolean")
-  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (docs "Whether to allow multiple items to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29740,17 +30052,17 @@
   (construct-only #f)
 )
 
-(define-property sort-type
-  (of-object "GtkRecentChooser")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+;; From GtkRecentChooserMenu
+
+(define-property limit
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamInt")
+  (docs "The maximum number of items to be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GtkRecentChooserMenu
-
 (define-property local-only
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
@@ -29760,37 +30072,37 @@
   (construct-only #f)
 )
 
-(define-property limit
+(define-property filter
   (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamInt")
-  (docs "The maximum number of items to 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 related-action
   (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamBoolean")
-  (docs "Whether there should be a tooltip on the item")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property filter
+(define-property show-not-found
   (of-object "GtkRecentChooserMenu")
-  (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 select-multiple
+(define-property sort-type
   (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -29805,37 +30117,46 @@
   (construct-only #t)
 )
 
-(define-property show-private
+(define-property show-tips
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether the private items should be displayed")
+  (docs "Whether there should be a tooltip on the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-not-found
+(define-property use-action-appearance
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether the items pointing to unavailable resources should be displayed")
+  (docs "Whether to use the related actions appearance properties")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property show-icons
+(define-property show-private
   (of-object "GtkRecentChooserMenu")
   (prop-type "GParamBoolean")
-  (docs "Whether there should be an icon near the item")
+  (docs "Whether the private items should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property sort-type
+(define-property select-multiple
   (of-object "GtkRecentChooserMenu")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether to allow multiple items to be selected")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property show-icons
+  (of-object "GtkRecentChooserMenu")
+  (prop-type "GParamBoolean")
+  (docs "Whether there should be an icon near the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -30158,24 +30479,6 @@
 
 ;; From GtkRecentChooserWidget
 
-(define-property sort-type
-  (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamEnum")
-  (docs "The sorting order of the items displayed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property show-not-found
-  (of-object "GtkRecentChooserWidget")
-  (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
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
@@ -30203,28 +30506,28 @@
   (construct-only #f)
 )
 
-(define-property show-tips
+(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)
 )
 
-(define-property limit
+(define-property select-multiple
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamInt")
-  (docs "The maximum number of items to be displayed")
+  (prop-type "GParamBoolean")
+  (docs "Whether to allow multiple items to be selected")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property orientation
+(define-property limit
   (of-object "GtkRecentChooserWidget")
-  (prop-type "GParamEnum")
-  (docs "The orientation of the orientable")
+  (prop-type "GParamInt")
+  (docs "The maximum number of items to be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -30239,19 +30542,37 @@
   (construct-only #f)
 )
 
-(define-property show-private
+(define-property show-tips
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether the private items should be displayed")
+  (docs "Whether there should be a tooltip on the item")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property select-multiple
+(define-property sort-type
+  (of-object "GtkRecentChooserWidget")
+  (prop-type "GParamEnum")
+  (docs "The sorting order of the items displayed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property orientation
+  (of-object "GtkRecentChooserWidget")
+  (prop-type "GParamEnum")
+  (docs "The orientation of the orientable")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property show-not-found
   (of-object "GtkRecentChooserWidget")
   (prop-type "GParamBoolean")
-  (docs "Whether to allow multiple items to be selected")
+  (docs "Whether the items pointing to unavailable resources should be displayed")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -31167,6 +31488,24 @@
   (when "last")
 )
 
+(define-property use-action-appearance
+  (of-object "GtkScaleButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property related-action
+  (of-object "GtkScaleButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property orientation
   (of-object "GtkScaleButton")
   (prop-type "GParamEnum")
@@ -32355,6 +32694,24 @@
 
 ;; From GtkSeparatorToolItem
 
+(define-property use-action-appearance
+  (of-object "GtkSeparatorToolItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property related-action
+  (of-object "GtkSeparatorToolItem")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkSeparatorToolItem")
   (prop-type "GParamPointer")
@@ -33052,7 +33409,7 @@
 
 (define-property gtk-fontconfig-timestamp
   (of-object "GtkSettings")
-  (prop-type "GParamInt")
+  (prop-type "GParamUInt")
   (docs "Timestamp of current fontconfig configuration")
   (readable #t)
   (writable #t)
@@ -33827,7 +34184,7 @@
 (define-property caps-lock-warning
   (of-object "GtkSpinButton")
   (prop-type "GParamBoolean")
-  (docs "Whether password entries will show a warning when Caps Lock is on or an input method is active")
+  (docs "Whether password entries will show a warning when Caps Lock is on")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -34884,6 +35241,24 @@
 
 ;; From GtkTearoffMenuItem
 
+(define-property use-action-appearance
+  (of-object "GtkTearoffMenuItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property related-action
+  (of-object "GtkTearoffMenuItem")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkTearoffMenuItem")
   (prop-type "GParamPointer")
@@ -35649,6 +36024,24 @@
   (when "first")
 )
 
+(define-property use-action-appearance
+  (of-object "GtkToggleButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property related-action
+  (of-object "GtkToggleButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkToggleButton")
   (prop-type "GParamPointer")
@@ -36344,6 +36737,24 @@
   )
 )
 
+(define-property use-action-appearance
+  (of-object "GtkToolItem")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property related-action
+  (of-object "GtkToolItem")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkToolItem")
   (prop-type "GParamPointer")
@@ -36613,6 +37024,24 @@
   (when "first")
 )
 
+(define-property use-action-appearance
+  (of-object "GtkToolButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property related-action
+  (of-object "GtkToolButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkToolButton")
   (prop-type "GParamPointer")
@@ -38407,6 +38836,24 @@
   (when "first")
 )
 
+(define-property related-action
+  (of-object "GtkToggleToolButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkToggleToolButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkToggleToolButton")
   (prop-type "GParamPointer")
@@ -38752,6 +39199,58 @@
   (when "first")
 )
 
+;; From GtkTreeModel
+
+(define-signal row-inserted
+  (of-object "GtkTreeModel")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("GtkTreePath*" "p0")
+    '("GtkTreeIter*" "p1")
+  )
+)
+
+(define-signal row-deleted
+  (of-object "GtkTreeModel")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("GtkTreePath*" "p0")
+  )
+)
+
+(define-signal row-changed
+  (of-object "GtkTreeModel")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GtkTreePath*" "p0")
+    '("GtkTreeIter*" "p1")
+  )
+)
+
+(define-signal row-has-child-toggled
+  (of-object "GtkTreeModel")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("GtkTreePath*" "p0")
+    '("GtkTreeIter*" "p1")
+  )
+)
+
+(define-signal rows-reordered
+  (of-object "GtkTreeModel")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("GtkTreePath*" "p0")
+    '("GtkTreeIter*" "p1")
+    '("gpointer" "p2")
+  )
+)
+
 ;; From GtkTreeModelFilter
 
 (define-property child-model
@@ -39226,7 +39725,7 @@
 (define-property search-column
   (of-object "GtkTreeView")
   (prop-type "GParamInt")
-  (docs "Model column to search through when searching through code")
+  (docs "Model column to search through during interactive search")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -39831,6 +40330,24 @@
   (construct-only #f)
 )
 
+(define-property related-action
+  (of-object "GtkVolumeButton")
+  (prop-type "GParamObject")
+  (docs "The action this activatable will activate and receive updates from")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property use-action-appearance
+  (of-object "GtkVolumeButton")
+  (prop-type "GParamBoolean")
+  (docs "Whether to use the related actions appearance properties")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 (define-property user-data
   (of-object "GtkVolumeButton")
   (prop-type "GParamPointer")

Modified: trunk/gtk/src/gtk_vfuncs.defs
==============================================================================
--- trunk/gtk/src/gtk_vfuncs.defs	(original)
+++ trunk/gtk/src/gtk_vfuncs.defs	Sun Feb  8 14:36:41 2009
@@ -29,7 +29,26 @@
     '("GtkWidget*" "proxy")
   )
 )
-             
+            
+; GtkActivatable
+
+(define-vfunc update
+  (of-object "GtkActivatable")
+  (return-type "void")
+  (parameters
+    '("GtkAction*" "action")
+    '("const-gchar*" "property_name")
+  )
+)
+
+(define-vfunc reset
+  (of-object "GtkActivatable")
+  (return-type "void")
+  (parameters
+    '("GtkAction*" "action")
+  )
+)
+ 
 ; GtkCellEditable
 
 (define-vfunc start_editing

Modified: trunk/gtk/src/menu.hg
==============================================================================
--- trunk/gtk/src/menu.hg	(original)
+++ trunk/gtk/src/menu.hg	Sun Feb  8 14:36:41 2009
@@ -35,7 +35,7 @@
 /** A drop-down menu consisting of Gtk::MenuItem objects which can be navigated and activated by the user to perform application functions.
  * Menus are normally placed inside a Gtk::MenuBar or another MenuItem as a sub menu.
  * A Menu can also be popped up, for instance as a right-click context menu, by calling the popup() method.
- * See also Gtk::OptionMenu.
+ * .
  * @ingroup Widgets
  * @ingroup Menus
  */

Modified: trunk/gtk/src/menuitem.hg
==============================================================================
--- trunk/gtk/src/menuitem.hg	(original)
+++ trunk/gtk/src/menuitem.hg	Sun Feb  8 14:36:41 2009
@@ -33,6 +33,8 @@
 class Menu;
 namespace Menu_Helpers { class Element; }
 
+// TODO: Inherit/Implement Activatable when we can break ABI.
+
 /** Child item for menus.
  * Handle highlighting, alignment, events and submenus.
  * As it derives from Gtk::Bin it can hold any valid child widget, altough only a few are really useful.

Copied: trunk/gtk/src/orientable.ccg (from r1092, /trunk/gtk/src/editable.ccg)
==============================================================================
--- /trunk/gtk/src/editable.ccg	(original)
+++ trunk/gtk/src/orientable.ccg	Sun Feb  8 14:36:41 2009
@@ -1,7 +1,7 @@
 // -*- c++ -*-
-/* $Id: editable.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
+/* $Id: orientatoin.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
 
-/* Copyright 1998-2002 The gtkmm Development Team
+/* Copyright 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Copied: trunk/gtk/src/orientable.hg (from r1092, /trunk/gtk/src/editable.hg)
==============================================================================
--- /trunk/gtk/src/editable.hg	(original)
+++ trunk/gtk/src/orientable.hg	Sun Feb  8 14:36:41 2009
@@ -1,6 +1,6 @@
-/* $Id: editable.hg,v 1.3 2006/05/18 17:53:15 murrayc Exp $ */
+/* $Id: orientable.hg,v 1.3 2006/05/18 17:53:15 murrayc Exp $ */
 
-/* Copyright (C) 1998-2002 The gtkmm Development Team
+/* Copyright (C) 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,6 +18,7 @@
  */
 
 #include <glibmm/interface.h>
+#include <gtkmm/enums.h>
 #include <gtk/gtk.h>
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
@@ -26,109 +27,23 @@
 namespace Gtk
 {
 
-/** Base class for text-editing widgets.
- *
- * The Gtk::Editable class is a base class for widgets for editing text,
- * such as Gtk::Entry. It cannot be instantiated by itself. The editable
- * class contains functions for generically manipulating an editable widget,
- * a large number of action signals used for key bindings, and several
- * signals that an application can connect to to modify the behavior of a
- * widget.
+/** This interface is implemented by all widgets that can be oriented 
+ * horizontally or vertically. Historically, such widgets have been realized as 
+ * subclasses of a common base class (e.g GtkBox/GtkHBox/GtkVBox and 
+ * GtkScale/GtkHScale/GtkVScale). GtkOrientable is more flexible in that it 
+ * allows the orientation to be changed at runtime, allowing the widgets to 'flip'.
  *
+ * @newin2p16
  */
-class Editable : public Glib::Interface
+class Orientable : public Glib::Interface
 {
-  _CLASS_INTERFACE(Editable,GtkEditable,GTK_EDITABLE,GtkEditableClass)
+  _CLASS_INTERFACE(Orientable, GtkOrientable, GTK_ORIENTABLE, GtkOrientableIface)
 
 public:
-  _WRAP_METHOD(void cut_clipboard(), gtk_editable_cut_clipboard)
-  _WRAP_METHOD(void copy_clipboard(), gtk_editable_copy_clipboard)
-  _WRAP_METHOD(void paste_clipboard(), gtk_editable_paste_clipboard)
-  _WRAP_METHOD(void delete_selection(), gtk_editable_delete_selection)
-  _WRAP_METHOD(void set_editable(bool is_editable = true), gtk_editable_set_editable)
-  _WRAP_METHOD(bool get_editable() const, gtk_editable_get_editable)
-
-  _WRAP_METHOD(void insert_text(const Glib::ustring& text, int length, int& position), gtk_editable_insert_text)
-  _WRAP_METHOD(void delete_text(int start_pos, int end_pos), gtk_editable_delete_text)
-
-  _WRAP_METHOD(Glib::ustring get_chars(int start_pos, int end_pos) const, gtk_editable_get_chars)
-
-  _WRAP_METHOD(void select_region(int start_pos, int end_pos), gtk_editable_select_region)
-  _WRAP_METHOD(bool get_selection_bounds(int& start_pos, int& end_pos) const, gtk_editable_get_selection_bounds)
-
-  _WRAP_METHOD(void set_position(int position), gtk_editable_set_position)
-  _WRAP_METHOD(int get_position() const, gtk_editable_get_position)
-
-  _IGNORE_SIGNAL(insert_text)
-
-#m4begin
-dnl // WRAP_SIGNAL "insert_text"
-dnl // C++ prototype: void insert_text(const Glib::ustring& text, int* position)
-dnl // C prototype: void insert_text(const gchar* text, gint length, gint* position)
-
-  _SIGNAL_PROXY(
-      insert_text, void, `const gchar* text, gint length, gint* position',
-      insert_text, void, `const Glib::ustring&, int*',dnl // C++ prototype
-      `Glib::ustring(text, text + length), position',`dnl // C -> C++ conversion
-      /**
-       * @param const Glib::ustring& text
-       * @param int* position
-       * @return void
-       */')
-
-  _SIGNAL_H(insert_text, void, `const Glib::ustring& text, int* position')
-  _SIGNAL_PH(insert_text, void, `GtkEditable* self, const gchar* text, gint length, gint* position')
-
-  _SIGNAL_CC(
-      insert_text, insert_text, void, void,
-      `const Glib::ustring& text, int* position',dnl // C++ arguments
-      `text.data(), text.bytes(), position')dnl // C++ -> C conversion
-
-  _SIGNAL_PCC(
-      insert_text, insert_text, void, void,
-      `GtkEditable* self, const gchar* text, gint length, gint* position',dnl // C arguments
-      `self, text, length, position',dnl // C argument names
-      `Glib::ustring(text, text + length), position',dnl // C -> C++ conversion
-      self)
-#m4end
-
-  _WRAP_SIGNAL(void delete_text(int start_pos, int end_pos), "delete_text")
-  _WRAP_SIGNAL(void changed(), "changed")
-
-protected:
-
-#m4begin
-dnl // WRAP_VFUNC "do_insert_text"
-dnl // C++ prototype: void insert_text_vfunc(const Glib::ustring& text, int& position)
-dnl // C prototype: void do_insert_text(const gchar* text, gint length, gint* position)
-
-  _VFUNC_H(insert_text_vfunc, void, `const Glib::ustring& text, int& position')
-  _VFUNC_PH(do_insert_text, void, `GtkEditable* self, const gchar* text, gint length, gint* position')
-  _VFUNC_CC(
-      insert_text_vfunc, do_insert_text, void, void,
-      `const Glib::ustring& text, int& position',dnl // C++ arguments
-      `text.data(), text.bytes(), &position')dnl // C++ -> C conversion
-  _VFUNC_PCC(
-      insert_text_vfunc, do_insert_text, void, void,
-      `GtkEditable* self, const gchar* text, gint length, gint* position',dnl // C arguments
-      `self, text, length, position',dnl // C argument names
-      `Glib::ustring(text, text + length), *position',dnl // C -> C++ conversion
-      self)
-#m4end
-
-  _WRAP_VFUNC(void delete_text(int start_pos, int end_pos), do_delete_text)
-
-#m4begin
-dnl // This special conversion is not in convert_gtk.m4, because allocating a new
-dnl // string is rarely needed -- probably not a good idea to make this generic.
-  _CONVERSION(`Glib::ustring', `gchar*', `g_strdup(($3).c_str())')
-#m4end
-  _WRAP_VFUNC(Glib::ustring get_chars(int start_pos, int end_pos) const, get_chars)
-
-  _WRAP_VFUNC(void select_region(int start_pos, int end_pos), set_selection_bounds)
-  _WRAP_VFUNC(bool get_selection_bounds(int& start_pos, int& end_pos) const, get_selection_bounds)
-  _WRAP_VFUNC(void set_position(int position), set_position)
-  _WRAP_VFUNC(int get_position() const, get_position)
+  _WRAP_METHOD(void set_orientation(Orientation orientation), gtk_orientable_set_orientation)
+  _WRAP_METHOD(Orientation get_orientation() const, gtk_orientable_get_orientation)
+
+  _WRAP_PROPERTY("orientation", Orientation)
 };
 
 } // namespace Gtk

Modified: trunk/gtk/src/paned.hg
==============================================================================
--- trunk/gtk/src/paned.hg	(original)
+++ trunk/gtk/src/paned.hg	Sun Feb  8 14:36:41 2009
@@ -30,6 +30,8 @@
 namespace Gtk
 {
 
+//TODO: Inherit/Implement Orientation when we can break ABI.
+
 /** This is the base class for widgets with two panes, arranged either
  * horizontally (Gtk::HPaned) or vertically (Gtk::VPaned).
  *

Modified: trunk/gtk/src/recentchoosermenu.hg
==============================================================================
--- trunk/gtk/src/recentchoosermenu.hg	(original)
+++ trunk/gtk/src/recentchoosermenu.hg	Sun Feb  8 14:36:41 2009
@@ -26,6 +26,8 @@
 namespace Gtk
 {
 
+// TODO: Inherit/Implement Activatable when we can break ABI.
+
 /** RecentChooserMenu is a widget suitable for displaying recently used files
  * inside a menu.  It can be used to set a sub-menu of a MenuItem using
  * MenuItem::item_set_submenu(), or as the menu of a MenuToolButton.

Modified: trunk/gtk/src/ruler.hg
==============================================================================
--- trunk/gtk/src/ruler.hg	(original)
+++ trunk/gtk/src/ruler.hg	Sun Feb  8 14:36:41 2009
@@ -28,6 +28,8 @@
 namespace Gtk
 {
 
+//TODO: Inherit/Implement Orientation when we can break ABI.
+
 /** Base class for horizontal or vertical rulers.
  *
  * NOTE this widget is considered too specialized/little-used for GTK+, and will in the future be moved to some other package. If your application needs this widget, feel free to use it, as the widget does work and is useful in some applications; it's just not of general interest. However, we are not accepting new features for the widget, and it will eventually move out of the GTK+ distribution.

Modified: trunk/gtk/src/scalebutton.hg
==============================================================================
--- trunk/gtk/src/scalebutton.hg	(original)
+++ trunk/gtk/src/scalebutton.hg	Sun Feb  8 14:36:41 2009
@@ -29,6 +29,8 @@
 namespace Gtk
 {
 
+//TODO: Inherit/Implement Orientation when we can break ABI.
+
 /** A button which pops up a scale widget.
  *
  * This kind of widget is commonly used for volume controls in multimedia 

Modified: trunk/gtk/src/scrollbar.hg
==============================================================================
--- trunk/gtk/src/scrollbar.hg	(original)
+++ trunk/gtk/src/scrollbar.hg	Sun Feb  8 14:36:41 2009
@@ -29,6 +29,8 @@
 namespace Gtk
 {
 
+//TODO: Inherit/Implement Orientation when we can break ABI.
+
 /** 
  * The Gtk::Scrollbar widget is an abstract base class for Gtk::HScrollbar
  * and Gtk::VScrollbar. It is not very useful in itself. 

Modified: trunk/gtk/src/separator.hg
==============================================================================
--- trunk/gtk/src/separator.hg	(original)
+++ trunk/gtk/src/separator.hg	Sun Feb  8 14:36:41 2009
@@ -28,6 +28,9 @@
 namespace Gtk
 {
 
+//TODO: Inherit/Implement Orientation when we can break ABI.
+
+
 /** Separator base class.
  * Abstract base class for Gtk::VSeperator and Gtk::HSeperator.
  */

Modified: trunk/gtk/src/toolbutton.hg
==============================================================================
--- trunk/gtk/src/toolbutton.hg	(original)
+++ trunk/gtk/src/toolbutton.hg	Sun Feb  8 14:36:41 2009
@@ -27,6 +27,8 @@
 namespace Gtk
 {
 
+// TODO: Inherit/Implement Activatable when we can break ABI.
+
 /** A Gtk::ToolItem subclass that displays buttons.
  * 
  * A ToolButton is are Gtk::ToolItem containing a button.

Modified: trunk/tools/extra_defs_gen/generate_defs_gtk.cc
==============================================================================
--- trunk/tools/extra_defs_gen/generate_defs_gtk.cc	(original)
+++ trunk/tools/extra_defs_gen/generate_defs_gtk.cc	Sun Feb  8 14:36:41 2009
@@ -74,6 +74,7 @@
             << get_defs( GTK_TYPE_ACCEL_LABEL )
             << get_defs( GTK_TYPE_ACTION )
             << get_defs( GTK_TYPE_ACTION_GROUP )
+            << get_defs( GTK_TYPE_ACTIVATABLE )
             << get_defs( GTK_TYPE_ADJUSTMENT )
             << get_defs( GTK_TYPE_ALIGNMENT)
             << get_defs( GTK_TYPE_ARROW )
@@ -109,6 +110,7 @@
             << get_defs( GTK_TYPE_CURVE )
             << get_defs( GTK_TYPE_DIALOG )
             << get_defs( GTK_TYPE_DRAWING_AREA )
+            << get_defs( GTK_TYPE_EDITABLE )
             << get_defs( GTK_TYPE_ENTRY )
             << get_defs( GTK_TYPE_ENTRY_COMPLETION )
             << get_defs( GTK_TYPE_EVENT_BOX )
@@ -146,6 +148,7 @@
             << get_defs( GTK_TYPE_NOTEBOOK )
             << get_defs( GTK_TYPE_OBJECT )
             << get_defs( GTK_TYPE_OPTION_MENU )
+            << get_defs( GTK_TYPE_ORIENTABLE ) 
             << get_defs( GTK_TYPE_PANED )
             << get_defs( GTK_TYPE_PIXMAP )
 #if !defined(G_OS_WIN32)
@@ -208,6 +211,7 @@
             << get_defs( GTK_TYPE_TOOLTIP )
             << get_defs( GTK_TYPE_TOOLTIPS )
             << get_defs( GTK_TYPE_TREE_SELECTION )
+            << get_defs( GTK_TYPE_TREE_MODEL ) 
             << get_defs( GTK_TYPE_TREE_MODEL_FILTER )            
             << get_defs( GTK_TYPE_TREE_STORE )
             << get_defs( GTK_TYPE_TREE_VIEW )



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