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

From: murrayc svn gnome org
To: svn-commits-list gnome org
Subject: gtkmm r1073 - in trunk: . gtk/gtkmm gtk/src tools/m4
Date: Fri, 16 Jan 2009 09:49:30 +0000 (UTC)
Author: murrayc
Date: Fri Jan 16 09:49:29 2009
New Revision: 1073
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1073&view=rev

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

* gtk/gtkmm/treeview_private.cc: SignalProxy_CellData_gtk_callback():
Added some checks for null models, to provide clues when doing some 
unusual incorrect uses of multiple inheritance.

* gtk/src/gtk_enums.defs:
* gtk/src/gtk_methods.defs: Regenerated.
* gtk/src/cellview.hg: Added get_model() and some new properties.
* gtk/src/entry.hg: Added unset_invisible_char(), get_invisible_char().
Added the new progress and icon methods and the properties, 
including the new im-module property.
* gtk/src/imagemenuitem.hg: Added get/set_use_stock(), 
set_accel_group().
* gtk/src/menuitem.hg: Added get/set_label(), get/set_use_underline() 
and properties.
* gtk/src/printoperation.hg: Added draw_page_finish(), 
set_defer_drawing().
* gtk/src/printsettings.hg: Added get_resolution_x(), 
get_resolution_y(), set_resolution_xy(), get/set_printer_lpi().
* gtk/src/statusicon.hg: Added get/set_has_tooltip(), 
get/set_tooltip_text(), get/set_tooltip_markup().
* gtk/src/textview.hg: Added im-module property.
* tools/m4/convert_gtk.m4: Added necessary conversions.

Modified:
   trunk/ChangeLog
   trunk/gtk/gtkmm/treeview_private.cc
   trunk/gtk/src/cellview.hg
   trunk/gtk/src/entry.hg
   trunk/gtk/src/gtk_enums.defs
   trunk/gtk/src/gtk_methods.defs
   trunk/gtk/src/imagemenuitem.hg
   trunk/gtk/src/menuitem.hg
   trunk/gtk/src/printoperation.hg
   trunk/gtk/src/printsettings.hg
   trunk/gtk/src/statusicon.hg
   trunk/gtk/src/textbuffer.hg
   trunk/gtk/src/textview.hg
   trunk/tools/m4/convert_gtk.m4

Modified: trunk/gtk/gtkmm/treeview_private.cc
==============================================================================
--- trunk/gtk/gtkmm/treeview_private.cc	(original)
+++ trunk/gtk/gtkmm/treeview_private.cc	Fri Jan 16 09:49:29 2009
@@ -30,6 +30,9 @@
 void SignalProxy_CellData_gtk_callback(GtkTreeViewColumn*, GtkCellRenderer* cell,
                                         GtkTreeModel* model, GtkTreeIter* iter, void* data)
 {
+  if(!model)
+    g_warning("SignalProxy_CellData_gtk_callback(): model is NULL, which is unusual.\n");
+
   TreeViewColumn::SlotCellData* the_slot = static_cast<TreeViewColumn::SlotCellData*>(data);
 
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -37,7 +40,14 @@
   {
   #endif //GLIBMM_EXCEPTIONS_ENABLE
     // use Slot::operator()
-    (*the_slot)(Glib::wrap(cell, false), TreeIter(model, iter));
+    Gtk::TreeModel::iterator cppiter = TreeIter(model, iter);
+    if(!cppiter->get_model_gobject())
+    {
+      g_warning("SignalProxy_CellData_gtk_callback() The cppiter has no model\n");
+      return; 
+    }
+
+    (*the_slot)(Glib::wrap(cell, false), cppiter);
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)

Modified: trunk/gtk/src/cellview.hg
==============================================================================
--- trunk/gtk/src/cellview.hg	(original)
+++ trunk/gtk/src/cellview.hg	Fri Jan 16 09:49:29 2009
@@ -80,6 +80,9 @@
    */
   void unset_model();
 
+  _WRAP_METHOD(Glib::RefPtr<TreeModel> get_model(), gtk_cell_view_get_model, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const TreeModel> get_model() const, gtk_cell_view_get_model, refreturn, constversion)
+
   _WRAP_METHOD(void set_displayed_row(const TreeModel::Path& path), gtk_cell_view_set_displayed_row)
   _WRAP_METHOD(TreeModel::Path get_displayed_row() const, gtk_cell_view_get_displayed_row)
   _WRAP_METHOD(bool get_size_of_row(const TreeModel::Path& path, Requisition& requisition) const, gtk_cell_view_get_size_of_row)
@@ -89,6 +92,10 @@
   _WRAP_METHOD(Glib::ListHandle<CellRenderer*> get_cell_renderers(), gtk_cell_view_get_cell_renderers)
   _WRAP_METHOD(Glib::ListHandle<const CellRenderer*> get_cell_renderers() const, gtk_cell_view_get_cell_renderers)
 
+  _WRAP_PROPERTY("background", Glib::ustring)
+  _WRAP_PROPERTY("background-gdk", Gdk::Color)
+  _WRAP_PROPERTY("background-set", bool)
+  _WRAP_PROPERTY("model", Glib::RefPtr<TreeModel>)
 };
 
 } // namespace Gtk

Modified: trunk/gtk/src/entry.hg
==============================================================================
--- trunk/gtk/src/entry.hg	(original)
+++ trunk/gtk/src/entry.hg	Fri Jan 16 09:49:29 2009
@@ -25,6 +25,7 @@
 #include <gtkmm/celleditable.h>
 #include <gtkmm/entrycompletion.h>
 #include <gtkmm/adjustment.h>
+#include <gtkmm/image.h> //For ImageType.
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/widget_p.h)
@@ -32,6 +33,8 @@
 namespace Gtk
 {
 
+_WRAP_ENUM(EntryIconPosition, GtkEntryIconPosition)
+
 //TODO: This is used in Range too, so put it somewhere more appropriate:
 typedef GtkBorder Border;
 
@@ -65,7 +68,8 @@
   _WRAP_METHOD(void set_visibility(bool visible = true), gtk_entry_set_visibility)
   _WRAP_METHOD(bool get_visibility() const, gtk_entry_get_visibility)
   _WRAP_METHOD(void set_invisible_char(gunichar ch), gtk_entry_set_invisible_char)
-  _WRAP_METHOD(gunichar get_invisible_char() const, gtk_entry_get_invisible_char)	
+  _WRAP_METHOD(void unset_invisible_char(), gtk_entry_unset_invisible_char)
+  _WRAP_METHOD(gunichar get_invisible_char() const, gtk_entry_get_invisible_char)
   _WRAP_METHOD(void set_has_frame(bool setting = true), gtk_entry_set_has_frame)
   _WRAP_METHOD(bool get_has_frame() const, gtk_entry_get_has_frame)
 
@@ -102,6 +106,36 @@
   _WRAP_METHOD(Glib::RefPtr<EntryCompletion> get_completion(), gtk_entry_get_completion, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const EntryCompletion> get_completion() const, gtk_entry_get_completion, refreturn, constversion)
 
+  _WRAP_METHOD(void set_progress_fraction(double fraction), gtk_entry_set_progress_fraction)
+  _WRAP_METHOD(double get_progress_fraction() const, gtk_entry_get_progress_fraction)
+  _WRAP_METHOD(void set_progress_pulse_step(double fraction), gtk_entry_set_progress_pulse_step)
+  _WRAP_METHOD(double get_progress_pulse_step(), gtk_entry_get_progress_pulse_step)
+  _WRAP_METHOD(void progress_pulse(), gtk_entry_progress_pulse)
+
+  //TODO: Reorder some parameters so we can always have default values for icon_pos?
+  _WRAP_METHOD(void set_icon_from_pixbuf(EntryIconPosition icon_pos, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_entry_set_icon_from_pixbuf)
+  _WRAP_METHOD(void set_icon_from_stock(EntryIconPosition icon_pos,
+							  const StockID& stock_id), gtk_entry_set_icon_from_stock)
+  _WRAP_METHOD(void set_icon_from_icon_name(EntryIconPosition icon_pos,
+							  const Glib::ustring& icon_name), gtk_entry_set_icon_from_icon_name)
+  _WRAP_METHOD(void set_icon_from_gicon(EntryIconPosition icon_pos, const Glib::RefPtr<Gio::Icon>& icon), gtk_entry_set_icon_from_gicon)
+  _WRAP_METHOD(ImageType get_storage_type(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_storage_type)
+  _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_pixbuf(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY), gtk_entry_get_pixbuf, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_pixbuf(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_pixbuf, refreturn, constversion)
+  _WRAP_METHOD(StockID get_stock(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_stock)
+  _WRAP_METHOD(Glib::ustring get_icon_name(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_name)
+  _WRAP_METHOD(Glib::RefPtr<Gio::Icon> get_gicon(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY), gtk_entry_get_gicon, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Gio::Icon> get_gicon(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_gicon, refreturn, constversion)
+  _WRAP_METHOD(void set_icon_activatable(EntryIconPosition icon_pos, bool activatable), gtk_entry_set_icon_activatable)
+  _WRAP_METHOD(bool get_icon_activatable(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const, gtk_entry_get_icon_activatable)
+  _WRAP_METHOD(void set_icon_sensitive(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY, bool sensitive = true), gtk_entry_set_icon_sensitive)
+  _WRAP_METHOD(bool get_icon_sensitive(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY), gtk_entry_get_icon_sensitive)
+  _WRAP_METHOD(int get_icon_at_pos(int x, int y), gtk_entry_get_icon_at_pos)
+  _WRAP_METHOD(void set_icon_tooltip_text(EntryIconPosition icon_pos, const Glib::ustring& tooltip), gtk_entry_set_icon_tooltip_text)
+  _WRAP_METHOD(void set_icon_tooltip_markup(EntryIconPosition icon_pos, const Glib::ustring& tooltip), gtk_entry_set_icon_tooltip_markup)
+  _WRAP_METHOD(void set_icon_drag_source(EntryIconPosition icon_pos, const Glib::RefPtr<TargetList>& target_list, Gdk::DragAction actions = Gdk::ACTION_COPY), gtk_entry_set_icon_drag_source)
+  _WRAP_METHOD(int get_current_icon_drag_source(), gtk_entry_get_current_icon_drag_source)
+
   _WRAP_SIGNAL(void populate_popup(Menu* menu), "populate_popup")
 
 #m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
@@ -129,6 +163,7 @@
   _WRAP_PROPERTY("visibility", bool)
   _WRAP_PROPERTY("has-frame", bool)
   _WRAP_PROPERTY("invisible-char", gunichar)
+  _WRAP_PROPERTY("invisible-char-set", bool)
   _WRAP_PROPERTY("activates-default", bool)
   _WRAP_PROPERTY("width-chars", int)
   _WRAP_PROPERTY("scroll-offset", int)
@@ -138,6 +173,24 @@
   _WRAP_PROPERTY("truncate-multiline", bool)
   _WRAP_PROPERTY("overwrite-mode", bool)
   _WRAP_PROPERTY("text-length", guint)
+  _WRAP_PROPERTY("caps-lock-warning", bool)
+  _WRAP_PROPERTY("progress-fraction", double)
+  _WRAP_PROPERTY("progress-pulse-step", double)
+  _WRAP_PROPERTY("pixbuf-primary", Glib::RefPtr<Gdk::Pixbuf>)
+  _WRAP_PROPERTY("pixbuf-secondary", Glib::RefPtr<Gdk::Pixbuf>)
+  _WRAP_PROPERTY("stock-primary", StockID)
+  _WRAP_PROPERTY("stock-secondary", StockID)
+  _WRAP_PROPERTY("icon-name-primary", Glib::ustring)
+  _WRAP_PROPERTY("icon-name-secondary", Glib::ustring)
+  _WRAP_PROPERTY("gicon-primary", Glib::RefPtr<Gio::Icon>)
+  _WRAP_PROPERTY("gicon-secondary", Glib::RefPtr<Gio::Icon>)
+  _WRAP_PROPERTY("storage-type-primary", ImageType)
+  _WRAP_PROPERTY("storage-type-secondary", ImageType)
+  _WRAP_PROPERTY("activatable-primary", bool)
+  _WRAP_PROPERTY("activatable-secondary", bool)
+  _WRAP_PROPERTY("sensitive-primary", bool)
+  _WRAP_PROPERTY("sensitive-secondary", bool)
+  _WRAP_PROPERTY("im-module", Glib::ustring)
 };
 
 } /* namespace Gtk */

Modified: trunk/gtk/src/gtk_enums.defs
==============================================================================
--- trunk/gtk/src/gtk_enums.defs	(original)
+++ trunk/gtk/src/gtk_enums.defs	Fri Jan 16 09:49:29 2009
@@ -1,4 +1,4 @@
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkaccelgroup.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkaccelgroup.h
 
 (define-flags-extended AccelFlags
   (in-module "Gtk")
@@ -10,7 +10,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkassistant.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkassistant.h
 
 (define-enum-extended AssistantPageType
   (in-module "Gtk")
@@ -24,7 +24,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkbuilder.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkbuilder.h
 
 (define-enum-extended BuilderError
   (in-module "Gtk")
@@ -41,7 +41,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkcalendar.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkcalendar.h
 
 (define-flags-extended CalendarDisplayOptions
   (in-module "Gtk")
@@ -56,7 +56,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkcellrendereraccel.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkcellrendereraccel.h
 
 (define-enum-extended CellRendererAccelMode
   (in-module "Gtk")
@@ -67,7 +67,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkcellrenderer.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkcellrenderer.h
 
 (define-flags-extended CellRendererState
   (in-module "Gtk")
@@ -91,7 +91,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkclist.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkclist.h
 
 (define-enum-extended CellType
   (in-module "Gtk")
@@ -127,7 +127,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkctree.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkctree.h
 
 (define-enum-extended CTreePos
   (in-module "Gtk")
@@ -174,7 +174,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkdebug.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkdebug.h
 
 (define-flags-extended DebugFlag
   (in-module "Gtk")
@@ -195,7 +195,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkdialog.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkdialog.h
 
 (define-flags-extended DialogFlags
   (in-module "Gtk")
@@ -225,7 +225,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkdnd.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkdnd.h
 
 (define-flags-extended DestDefaults
   (in-module "Gtk")
@@ -249,7 +249,18 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkenums.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkentry.h
+
+(define-enum-extended EntryIconPosition
+  (in-module "Gtk")
+  (c-name "GtkEntryIconPosition")
+  (values
+    '("primary" "GTK_ENTRY_ICON_PRIMARY" "0")
+    '("secondary" "GTK_ENTRY_ICON_SECONDARY" "1")
+  )
+)
+
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkenums.h
 
 (define-enum-extended AnchorType
   (in-module "Gtk")
@@ -275,6 +286,16 @@
   )
 )
 
+(define-enum-extended ArrowPlacement
+  (in-module "Gtk")
+  (c-name "GtkArrowPlacement")
+  (values
+    '("both" "GTK_ARROWS_BOTH" "0")
+    '("start" "GTK_ARROWS_START" "1")
+    '("end" "GTK_ARROWS_END" "2")
+  )
+)
+
 (define-enum-extended ArrowType
   (in-module "Gtk")
   (c-name "GtkArrowType")
@@ -829,7 +850,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkfilechooser.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkfilechooser.h
 
 (define-enum-extended FileChooserAction
   (in-module "Gtk")
@@ -862,7 +883,71 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkfilefilter.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkfilechooserprivate.h
+
+(define-enum-extended State
+  (in-module "Load")
+  (c-name "LoadState")
+  (values
+    '("empty" "LOAD_EMPTY" "0")
+    '("preload" "LOAD_PRELOAD" "1")
+    '("loading" "LOAD_LOADING" "2")
+    '("finished" "LOAD_FINISHED" "3")
+  )
+)
+
+(define-enum-extended State
+  (in-module "Reload")
+  (c-name "ReloadState")
+  (values
+    '("empty" "RELOAD_EMPTY" "0")
+    '("has-folder" "RELOAD_HAS_FOLDER" "1")
+    '("was-unmapped" "RELOAD_WAS_UNMAPPED" "2")
+  )
+)
+
+(define-enum-extended Mode
+  (in-module "Location")
+  (c-name "LocationMode")
+  (values
+    '("path-bar" "LOCATION_MODE_PATH_BAR" "0")
+    '("filename-entry" "LOCATION_MODE_FILENAME_ENTRY" "1")
+  )
+)
+
+(define-enum-extended Mode
+  (in-module "Operation")
+  (c-name "OperationMode")
+  (values
+    '("browse" "OPERATION_MODE_BROWSE" "0")
+    '("search" "OPERATION_MODE_SEARCH" "1")
+    '("recent" "OPERATION_MODE_RECENT" "2")
+  )
+)
+
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkfilechooserutils.h
+
+(define-flags-extended FileChooserProp
+  (in-module "Gtk")
+  (c-name "GtkFileChooserProp")
+  (values
+    '("first" "GTK_FILE_CHOOSER_PROP_FIRST" "0x1000")
+    '("action" "GTK_FILE_CHOOSER_PROP_ACTION" "0x1000")
+    '("file-system-backend" "GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND" "1")
+    '("filter" "GTK_FILE_CHOOSER_PROP_FILTER" "2")
+    '("local-only" "GTK_FILE_CHOOSER_PROP_LOCAL_ONLY" "3")
+    '("preview-widget" "GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET" "4")
+    '("preview-widget-active" "GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE" "5")
+    '("use-preview-label" "GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL" "6")
+    '("extra-widget" "GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET" "7")
+    '("select-multiple" "GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE" "8")
+    '("show-hidden" "GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN" "9")
+    '("do-overwrite-confirmation" "GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION" "10")
+    '("last" "GTK_FILE_CHOOSER_PROP_LAST" "0xA")
+  )
+)
+
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkfilefilter.h
 
 (define-flags-extended FileFilterFlags
   (in-module "Gtk")
@@ -875,36 +960,19 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkfilesystem.h
-
-(define-flags-extended FileInfoType
-  (in-module "Gtk")
-  (c-name "GtkFileInfoType")
-  (values
-    '("display-name" "GTK_FILE_INFO_DISPLAY_NAME" "1 << 0")
-    '("is-folder" "GTK_FILE_INFO_IS_FOLDER" "1 << 1")
-    '("is-hidden" "GTK_FILE_INFO_IS_HIDDEN" "1 << 2")
-    '("mime-type" "GTK_FILE_INFO_MIME_TYPE" "1 << 3")
-    '("modification-time" "GTK_FILE_INFO_MODIFICATION_TIME" "1 << 4")
-    '("size" "GTK_FILE_INFO_SIZE" "1 << 5")
-    '("icon" "GTK_FILE_INFO_ICON" "1 << 6")
-  )
-)
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkfilesystemmodel.h
 
-(define-enum-extended FileSystemError
+(define-enum-extended FileSystemModelColumns
   (in-module "Gtk")
-  (c-name "GtkFileSystemError")
+  (c-name "GtkFileSystemModelColumns")
   (values
-    '("nonexistent" "GTK_FILE_SYSTEM_ERROR_NONEXISTENT" "0")
-    '("not-folder" "GTK_FILE_SYSTEM_ERROR_NOT_FOLDER" "1")
-    '("invalid-uri" "GTK_FILE_SYSTEM_ERROR_INVALID_URI" "2")
-    '("bad-filename" "GTK_FILE_SYSTEM_ERROR_BAD_FILENAME" "3")
-    '("failed" "GTK_FILE_SYSTEM_ERROR_FAILED" "4")
-    '("already-exists" "GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS" "5")
+    '("info" "GTK_FILE_SYSTEM_MODEL_INFO" "0")
+    '("display-name" "GTK_FILE_SYSTEM_MODEL_DISPLAY_NAME" "1")
+    '("n-columns" "GTK_FILE_SYSTEM_MODEL_N_COLUMNS" "2")
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkicontheme.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkicontheme.h
 
 (define-flags-extended IconLookupFlags
   (in-module "Gtk")
@@ -927,7 +995,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkiconview.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkiconview.h
 
 (define-enum-extended IconViewDropPosition
   (in-module "Gtk")
@@ -942,7 +1010,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkimage.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkimage.h
 
 (define-enum-extended ImageType
   (in-module "Gtk")
@@ -960,7 +1028,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkmessagedialog.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkmessagedialog.h
 
 (define-enum-extended MessageType
   (in-module "Gtk")
@@ -987,7 +1055,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtknotebook.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtknotebook.h
 
 (define-enum-extended NotebookTab
   (in-module "Gtk")
@@ -998,7 +1066,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkobject.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkobject.h
 
 (define-flags-extended ObjectFlags
   (in-module "Gtk")
@@ -1009,7 +1077,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprintbackend.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkprintbackend.h
 
 (define-enum-extended PrintBackendError
   (in-module "Gtk")
@@ -1019,8 +1087,17 @@
   )
 )
 
-;; Hand-coded because enums.pl seems to fail on it. murrayc
-;; From /home/murrayc/svn/gnome220/branches/gtk+/trunk/gtk/gtkprinter.h
+(define-enum-extended PrintBackendStatus
+  (in-module "Gtk")
+  (c-name "GtkPrintBackendStatus")
+  (values
+    '("unknown" "GTK_PRINT_BACKEND_STATUS_UNKNOWN" "0")
+    '("ok" "GTK_PRINT_BACKEND_STATUS_OK" "1")
+    '("unavailable" "GTK_PRINT_BACKEND_STATUS_UNAVAILABLE" "2")
+  )
+)
+
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkprinter.h
 
 (define-flags-extended PrintCapabilities
   (in-module "Gtk")
@@ -1039,7 +1116,26 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkprintoperation.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkprinteroption.h
+
+(define-enum-extended PrinterOptionType
+  (in-module "Gtk")
+  (c-name "GtkPrinterOptionType")
+  (values
+    '("boolean" "GTK_PRINTER_OPTION_TYPE_BOOLEAN" "0")
+    '("pickone" "GTK_PRINTER_OPTION_TYPE_PICKONE" "1")
+    '("pickone-password" "GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD" "2")
+    '("pickone-passcode" "GTK_PRINTER_OPTION_TYPE_PICKONE_PASSCODE" "3")
+    '("pickone-real" "GTK_PRINTER_OPTION_TYPE_PICKONE_REAL" "4")
+    '("pickone-int" "GTK_PRINTER_OPTION_TYPE_PICKONE_INT" "5")
+    '("pickone-string" "GTK_PRINTER_OPTION_TYPE_PICKONE_STRING" "6")
+    '("alternative" "GTK_PRINTER_OPTION_TYPE_ALTERNATIVE" "7")
+    '("string" "GTK_PRINTER_OPTION_TYPE_STRING" "8")
+    '("filesave" "GTK_PRINTER_OPTION_TYPE_FILESAVE" "9")
+  )
+)
+
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkprintoperation.h
 
 (define-enum-extended PrintStatus
   (in-module "Gtk")
@@ -1090,7 +1186,19 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkprivate.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkprintoperation-private.h
+
+(define-enum-extended PageDrawingState
+  (in-module "Gtk")
+  (c-name "GtkPageDrawingState")
+  (values
+    '("ready" "GTK_PAGE_DRAWING_STATE_READY" "0")
+    '("drawing" "GTK_PAGE_DRAWING_STATE_DRAWING" "1")
+    '("deferred-drawing" "GTK_PAGE_DRAWING_STATE_DEFERRED_DRAWING" "2")
+  )
+)
+
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkprivate.h
 
 (define-flags-extended PrivateFlags
   (in-module "Gtk")
@@ -1112,7 +1220,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkprogressbar.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkprogressbar.h
 
 (define-enum-extended ProgressBarStyle
   (in-module "Gtk")
@@ -1134,7 +1242,27 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkrc.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkrbtree.h
+
+(define-flags-extended RBNodeColor
+  (in-module "Gtk")
+  (c-name "GtkRBNodeColor")
+  (values
+    '("black" "GTK_RBNODE_BLACK" "1 << 0")
+    '("red" "GTK_RBNODE_RED" "1 << 1")
+    '("is-parent" "GTK_RBNODE_IS_PARENT" "1 << 2")
+    '("is-selected" "GTK_RBNODE_IS_SELECTED" "1 << 3")
+    '("is-prelit" "GTK_RBNODE_IS_PRELIT" "1 << 4")
+    '("is-semi-collapsed" "GTK_RBNODE_IS_SEMI_COLLAPSED" "1 << 5")
+    '("is-semi-expanded" "GTK_RBNODE_IS_SEMI_EXPANDED" "1 << 6")
+    '("invalid" "GTK_RBNODE_INVALID" "1 << 7")
+    '("column-invalid" "GTK_RBNODE_COLUMN_INVALID" "1 << 8")
+    '("descendants-invalid" "GTK_RBNODE_DESCENDANTS_INVALID" "1 << 9")
+    '("non-colors" "GTK_RBNODE_NON_COLORS" "0x4")
+  )
+)
+
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkrc.h
 
 (define-flags-extended RcFlags
   (in-module "Gtk")
@@ -1194,7 +1322,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkrecentchooser.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkrecentchooser.h
 
 (define-enum-extended RecentSortType
   (in-module "Gtk")
@@ -1216,7 +1344,28 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkrecentfilter.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkrecentchooserutils.h
+
+(define-flags-extended RecentChooserProp
+  (in-module "Gtk")
+  (c-name "GtkRecentChooserProp")
+  (values
+    '("first" "GTK_RECENT_CHOOSER_PROP_FIRST" "0x3000")
+    '("recent-manager" "GTK_RECENT_CHOOSER_PROP_RECENT_MANAGER" "12289")
+    '("show-private" "GTK_RECENT_CHOOSER_PROP_SHOW_PRIVATE" "12290")
+    '("show-not-found" "GTK_RECENT_CHOOSER_PROP_SHOW_NOT_FOUND" "12291")
+    '("show-tips" "GTK_RECENT_CHOOSER_PROP_SHOW_TIPS" "12292")
+    '("show-icons" "GTK_RECENT_CHOOSER_PROP_SHOW_ICONS" "12293")
+    '("select-multiple" "GTK_RECENT_CHOOSER_PROP_SELECT_MULTIPLE" "12294")
+    '("limit" "GTK_RECENT_CHOOSER_PROP_LIMIT" "12295")
+    '("local-only" "GTK_RECENT_CHOOSER_PROP_LOCAL_ONLY" "12296")
+    '("sort-type" "GTK_RECENT_CHOOSER_PROP_SORT_TYPE" "12297")
+    '("filter" "GTK_RECENT_CHOOSER_PROP_FILTER" "12298")
+    '("last" "GTK_RECENT_CHOOSER_PROP_LAST" "12299")
+  )
+)
+
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkrecentfilter.h
 
 (define-flags-extended RecentFilterFlags
   (in-module "Gtk")
@@ -1231,7 +1380,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkrecentmanager.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkrecentmanager.h
 
 (define-enum-extended RecentManagerError
   (in-module "Gtk")
@@ -1247,7 +1396,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtksizegroup.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtksizegroup.h
 
 (define-enum-extended SizeGroupMode
   (in-module "Gtk")
@@ -1260,7 +1409,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkspinbutton.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkspinbutton.h
 
 (define-enum-extended SpinButtonUpdatePolicy
   (in-module "Gtk")
@@ -1285,7 +1434,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtktextbuffer.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtktextbuffer.h
 
 (define-enum-extended TextBufferTargetInfo
   (in-module "Gtk")
@@ -1294,7 +1443,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtktextiter.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtktextiter.h
 
 (define-flags-extended TextSearchFlags
   (in-module "Gtk")
@@ -1305,7 +1454,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtktextview.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtktextview.h
 
 (define-enum-extended TextWindowType
   (in-module "Gtk")
@@ -1321,7 +1470,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtktoolbar.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtktoolbar.h
 
 (define-enum-extended ToolbarSpaceStyle
   (in-module "Gtk")
@@ -1332,7 +1481,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtktree.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtktree.h
 
 (define-enum-extended TreeViewMode
   (in-module "Gtk")
@@ -1343,7 +1492,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtktreemodel.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtktreemodel.h
 
 (define-flags-extended TreeModelFlags
   (in-module "Gtk")
@@ -1354,7 +1503,24 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtktreeviewcolumn.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtktreeprivate.h
+
+(define-flags-extended TreeViewFlags
+  (in-module "Gtk")
+  (c-name "GtkTreeViewFlags")
+  (values
+    '("is-list" "GTK_TREE_VIEW_IS_LIST" "1 << 0")
+    '("show-expanders" "GTK_TREE_VIEW_SHOW_EXPANDERS" "1 << 1")
+    '("in-column-resize" "GTK_TREE_VIEW_IN_COLUMN_RESIZE" "1 << 2")
+    '("arrow-prelit" "GTK_TREE_VIEW_ARROW_PRELIT" "1 << 3")
+    '("headers-visible" "GTK_TREE_VIEW_HEADERS_VISIBLE" "1 << 4")
+    '("draw-keyfocus" "GTK_TREE_VIEW_DRAW_KEYFOCUS" "1 << 5")
+    '("model-setup" "GTK_TREE_VIEW_MODEL_SETUP" "1 << 6")
+    '("in-column-drag" "GTK_TREE_VIEW_IN_COLUMN_DRAG" "1 << 7")
+  )
+)
+
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtktreeviewcolumn.h
 
 (define-enum-extended TreeViewColumnSizing
   (in-module "Gtk")
@@ -1366,7 +1532,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtktreeview.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtktreeview.h
 
 (define-enum-extended TreeViewDropPosition
   (in-module "Gtk")
@@ -1379,7 +1545,7 @@
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkuimanager.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkuimanager.h
 
 (define-flags-extended UIManagerItemType
   (in-module "Gtk")
@@ -1395,10 +1561,11 @@
     '("toolitem" "GTK_UI_MANAGER_TOOLITEM" "1 << 6")
     '("separator" "GTK_UI_MANAGER_SEPARATOR" "1 << 7")
     '("accelerator" "GTK_UI_MANAGER_ACCELERATOR" "1 << 8")
+    '("popup-with-accels" "GTK_UI_MANAGER_POPUP_WITH_ACCELS" "1 << 9")
   )
 )
 
-;; From /opt/gnome220/include/gtk-2.0/gtk/gtkwidget.h
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkwidget.h
 
 (define-flags-extended WidgetFlags
   (in-module "Gtk")
@@ -1435,3 +1602,27 @@
   )
 )
 
+;; From /home/murrayc/svn/gnome220/gtk+/gtk/gtkwin32embed.h
+
+(define-enum-extended Win32EmbedMessageType
+  (in-module "Gtk")
+  (c-name "GtkWin32EmbedMessageType")
+  (values
+    '("window-activate" "GTK_WIN32_EMBED_WINDOW_ACTIVATE" "0")
+    '("window-deactivate" "GTK_WIN32_EMBED_WINDOW_DEACTIVATE" "1")
+    '("focus-in" "GTK_WIN32_EMBED_FOCUS_IN" "2")
+    '("focus-out" "GTK_WIN32_EMBED_FOCUS_OUT" "3")
+    '("modality-on" "GTK_WIN32_EMBED_MODALITY_ON" "4")
+    '("modality-off" "GTK_WIN32_EMBED_MODALITY_OFF" "5")
+    '("parent-notify" "GTK_WIN32_EMBED_PARENT_NOTIFY" "6")
+    '("event-plug-mapped" "GTK_WIN32_EMBED_EVENT_PLUG_MAPPED" "7")
+    '("plug-resized" "GTK_WIN32_EMBED_PLUG_RESIZED" "8")
+    '("request-focus" "GTK_WIN32_EMBED_REQUEST_FOCUS" "9")
+    '("focus-next" "GTK_WIN32_EMBED_FOCUS_NEXT" "10")
+    '("focus-prev" "GTK_WIN32_EMBED_FOCUS_PREV" "11")
+    '("grab-key" "GTK_WIN32_EMBED_GRAB_KEY" "12")
+    '("ungrab-key" "GTK_WIN32_EMBED_UNGRAB_KEY" "13")
+    '("last" "GTK_WIN32_EMBED_LAST" "14")
+  )
+)
+

Modified: trunk/gtk/src/gtk_methods.defs
==============================================================================
--- trunk/gtk/src/gtk_methods.defs	(original)
+++ trunk/gtk/src/gtk_methods.defs	Fri Jan 16 09:49:29 2009
@@ -120,6 +120,13 @@
   (gtype-id "GTK_TYPE_LIST_STORE")
 )
 
+(define-object MountOperation
+  (in-module "Gtk")
+  (parent "GMountOperation")
+  (c-name "GtkMountOperation")
+  (gtype-id "GTK_TYPE_MOUNT_OPERATION")
+)
+
 (define-object Object
   (in-module "Gtk")
   (parent "GInitiallyUnowned")
@@ -197,6 +204,12 @@
   (gtype-id "GTK_TYPE_ADJUSTMENT")
 )
 
+(define-object Orientable
+  (in-module "Gtk")
+  (c-name "GtkOrientable")
+  (gtype-id "GTK_TYPE_ORIENTABLE")
+)
+
 (define-object PrintBackend
   (in-module "Gtk")
   (parent "GObject")
@@ -1581,6 +1594,16 @@
   )
 )
 
+(define-enum EntryIconPosition
+  (in-module "Gtk")
+  (c-name "GtkEntryIconPosition")
+  (gtype-id "GTK_TYPE_ENTRY_ICON_POSITION")
+  (values
+    '("primary" "GTK_ENTRY_ICON_PRIMARY")
+    '("secondary" "GTK_ENTRY_ICON_SECONDARY")
+  )
+)
+
 (define-enum AnchorType
   (in-module "Gtk")
   (c-name "GtkAnchorType")
@@ -1606,6 +1629,17 @@
   )
 )
 
+(define-enum ArrowPlacement
+  (in-module "Gtk")
+  (c-name "GtkArrowPlacement")
+  (gtype-id "GTK_TYPE_ARROW_PLACEMENT")
+  (values
+    '("both" "GTK_ARROWS_BOTH")
+    '("start" "GTK_ARROWS_START")
+    '("end" "GTK_ARROWS_END")
+  )
+)
+
 (define-enum ArrowType
   (in-module "Gtk")
   (c-name "GtkArrowType")
@@ -2478,10 +2512,10 @@
   (c-name "GtkObjectFlags")
   (gtype-id "GTK_TYPE_OBJECT_FLAGS")
   (values
-    '("gtk-in-destruction" "GTK_IN_DESTRUCTION")
-    '("#if" "#if")
-    '("#endif" "#endif")
-    '("gtk-reserved-2" "GTK_RESERVED_2")
+    '("in-destruction" "GTK_IN_DESTRUCTION")
+    '("floating" "GTK_FLOATING")
+    '("reserved-1" "GTK_RESERVED_1")
+    '("reserved-2" "GTK_RESERVED_2")
   )
 )
 
@@ -2503,7 +2537,18 @@
   (c-name "GtkPrintBackendError")
   (gtype-id "GTK_TYPE_PRINT_BACKEND_ERROR")
   (values
-    '("c" "GTK_PRINT_BACKEND_ERROR_GENERIC")
+    '("generic" "GTK_PRINT_BACKEND_ERROR_GENERIC")
+  )
+)
+
+(define-enum PrintBackendStatus
+  (in-module "Gtk")
+  (c-name "GtkPrintBackendStatus")
+  (gtype-id "GTK_TYPE_PRINT_BACKEND_STATUS")
+  (values
+    '("unknown" "GTK_PRINT_BACKEND_STATUS_UNKNOWN")
+    '("ok" "GTK_PRINT_BACKEND_STATUS_OK")
+    '("unavailable" "GTK_PRINT_BACKEND_STATUS_UNAVAILABLE")
   )
 )
 
@@ -2596,6 +2641,17 @@
   )
 )
 
+(define-enum PageDrawingState
+  (in-module "Gtk")
+  (c-name "GtkPageDrawingState")
+  (gtype-id "GTK_TYPE_PAGE_DRAWING_STATE")
+  (values
+    '("ready" "GTK_PAGE_DRAWING_STATE_READY")
+    '("drawing" "GTK_PAGE_DRAWING_STATE_DRAWING")
+    '("deferred-drawing" "GTK_PAGE_DRAWING_STATE_DEFERRED_DRAWING")
+  )
+)
+
 (define-flags PrivateFlags
   (in-module "Gtk")
   (c-name "GtkPrivateFlags")
@@ -2969,6 +3025,7 @@
     '("toolitem" "GTK_UI_MANAGER_TOOLITEM")
     '("separator" "GTK_UI_MANAGER_SEPARATOR")
     '("accelerator" "GTK_UI_MANAGER_ACCELERATOR")
+    '("popup-with-accels" "GTK_UI_MANAGER_POPUP_WITH_ACCELS")
   )
 )
 
@@ -3168,6 +3225,12 @@
   )
 )
 
+(define-method get_authors
+  (of-object "GtkAboutDialog")
+  (c-name "gtk_about_dialog_get_authors")
+  (return-type "const-gchar**")
+)
+
 (define-method set_authors
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_set_authors")
@@ -3177,6 +3240,12 @@
   )
 )
 
+(define-method get_documenters
+  (of-object "GtkAboutDialog")
+  (c-name "gtk_about_dialog_get_documenters")
+  (return-type "const-gchar**")
+)
+
 (define-method set_documenters
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_set_documenters")
@@ -3186,6 +3255,12 @@
   )
 )
 
+(define-method get_artists
+  (of-object "GtkAboutDialog")
+  (c-name "gtk_about_dialog_get_artists")
+  (return-type "const-gchar**")
+)
+
 (define-method set_artists
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_set_artists")
@@ -5880,6 +5955,12 @@
   )
 )
 
+(define-method get_model
+  (of-object "GtkCellView")
+  (c-name "gtk_cell_view_get_model")
+  (return-type "GtkTreeModel*")
+)
+
 (define-method set_displayed_row
   (of-object "GtkCellView")
   (c-name "gtk_cell_view_set_displayed_row")
@@ -6299,7 +6380,7 @@
 
 (define-function gtk_clist_get_type
   (c-name "gtk_clist_get_type")
-  (return-type "GtkType")
+  (return-type "GType")
 )
 
 (define-function gtk_clist_new
@@ -7953,7 +8034,7 @@
 
 (define-function gtk_ctree_get_type
   (c-name "gtk_ctree_get_type")
-  (return-type "GtkType")
+  (return-type "GType")
 )
 
 (define-function gtk_ctree_new_with_titles
@@ -9273,8 +9354,8 @@
   (c-name "gtk_editable_select_region")
   (return-type "none")
   (parameters
-    '("gint" "start")
-    '("gint" "end")
+    '("gint" "start_pos")
+    '("gint" "end_pos")
   )
 )
 
@@ -9283,8 +9364,8 @@
   (c-name "gtk_editable_get_selection_bounds")
   (return-type "gboolean")
   (parameters
-    '("gint*" "start")
-    '("gint*" "end")
+    '("gint*" "start_pos")
+    '("gint*" "end_pos")
   )
 )
 
@@ -9617,6 +9698,12 @@
   (return-type "gunichar")
 )
 
+(define-method unset_invisible_char
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_unset_invisible_char")
+  (return-type "none")
+)
+
 (define-method set_has_frame
   (of-object "GtkEntry")
   (c-name "gtk_entry_set_has_frame")
@@ -9807,6 +9894,212 @@
   (return-type "GtkAdjustment*")
 )
 
+(define-method set_progress_fraction
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_progress_fraction")
+  (return-type "none")
+  (parameters
+    '("gdouble" "fraction")
+  )
+)
+
+(define-method get_progress_fraction
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_progress_fraction")
+  (return-type "gdouble")
+)
+
+(define-method set_progress_pulse_step
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_progress_pulse_step")
+  (return-type "none")
+  (parameters
+    '("gdouble" "fraction")
+  )
+)
+
+(define-method get_progress_pulse_step
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_progress_pulse_step")
+  (return-type "gdouble")
+)
+
+(define-method progress_pulse
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_progress_pulse")
+  (return-type "none")
+)
+
+(define-method set_icon_from_pixbuf
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_icon_from_pixbuf")
+  (return-type "none")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+    '("GdkPixbuf*" "pixbuf")
+  )
+)
+
+(define-method set_icon_from_stock
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_icon_from_stock")
+  (return-type "none")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+    '("const-gchar*" "stock_id")
+  )
+)
+
+(define-method set_icon_from_icon_name
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_icon_from_icon_name")
+  (return-type "none")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+    '("const-gchar*" "icon_name")
+  )
+)
+
+(define-method set_icon_from_gicon
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_icon_from_gicon")
+  (return-type "none")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+    '("GIcon*" "icon")
+  )
+)
+
+(define-method get_storage_type
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_storage_type")
+  (return-type "GtkImageType")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+  )
+)
+
+(define-method get_pixbuf
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_pixbuf")
+  (return-type "GdkPixbuf*")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+  )
+)
+
+(define-method get_stock
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_stock")
+  (return-type "const-gchar*")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+  )
+)
+
+(define-method get_icon_name
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_icon_name")
+  (return-type "const-gchar*")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+  )
+)
+
+(define-method get_gicon
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_gicon")
+  (return-type "GIcon*")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+  )
+)
+
+(define-method set_icon_activatable
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_icon_activatable")
+  (return-type "none")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+    '("gboolean" "activatable")
+  )
+)
+
+(define-method get_icon_activatable
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_icon_activatable")
+  (return-type "gboolean")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+  )
+)
+
+(define-method set_icon_sensitive
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_icon_sensitive")
+  (return-type "none")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+    '("gboolean" "sensitive")
+  )
+)
+
+(define-method get_icon_sensitive
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_icon_sensitive")
+  (return-type "gboolean")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+  )
+)
+
+(define-method get_icon_at_pos
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_icon_at_pos")
+  (return-type "gint")
+  (parameters
+    '("gint" "x")
+    '("gint" "y")
+  )
+)
+
+(define-method set_icon_tooltip_text
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_icon_tooltip_text")
+  (return-type "none")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+    '("const-gchar*" "tooltip")
+  )
+)
+
+(define-method set_icon_tooltip_markup
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_icon_tooltip_markup")
+  (return-type "none")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+    '("const-gchar*" "tooltip")
+  )
+)
+
+(define-method set_icon_drag_source
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_icon_drag_source")
+  (return-type "none")
+  (parameters
+    '("GtkEntryIconPosition" "icon_pos")
+    '("GtkTargetList*" "target_list")
+    '("GdkDragAction" "actions")
+  )
+)
+
+(define-method get_current_icon_drag_source
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_current_icon_drag_source")
+  (return-type "gint")
+)
+
 (define-function gtk_entry_new_with_max_length
   (c-name "gtk_entry_new_with_max_length")
   (return-type "GtkWidget*")
@@ -13036,6 +13329,30 @@
   (return-type "GtkWidget*")
 )
 
+(define-method set_use_stock
+  (of-object "GtkImageMenuItem")
+  (c-name "gtk_image_menu_item_set_use_stock")
+  (return-type "none")
+  (parameters
+    '("gboolean" "use_stock")
+  )
+)
+
+(define-method get_use_stock
+  (of-object "GtkImageMenuItem")
+  (c-name "gtk_image_menu_item_get_use_stock")
+  (return-type "gboolean")
+)
+
+(define-method set_accel_group
+  (of-object "GtkImageMenuItem")
+  (c-name "gtk_image_menu_item_set_accel_group")
+  (return-type "none")
+  (parameters
+    '("GtkAccelGroup*" "accel_group")
+  )
+)
+
 
 
 ;; From gtkimcontext.h
@@ -13199,6 +13516,21 @@
   )
 )
 
+(define-method get_context_id
+  (of-object "GtkIMMulticontext")
+  (c-name "gtk_im_multicontext_get_context_id")
+  (return-type "const-char*")
+)
+
+(define-method set_context_id
+  (of-object "GtkIMMulticontext")
+  (c-name "gtk_im_multicontext_set_context_id")
+  (return-type "none")
+  (parameters
+    '("const-char*" "context_id")
+  )
+)
+
 
 
 ;; From gtkinputdialog.h
@@ -14050,7 +14382,7 @@
 
 (define-function gtk_list_get_type
   (c-name "gtk_list_get_type")
-  (return-type "GtkType")
+  (return-type "GType")
 )
 
 (define-function gtk_list_new
@@ -14263,7 +14595,7 @@
 
 (define-function gtk_list_item_get_type
   (c-name "gtk_list_item_get_type")
-  (return-type "GtkType")
+  (return-type "GType")
 )
 
 (define-function gtk_list_item_new
@@ -15253,6 +15585,36 @@
   (return-type "const-gchar*")
 )
 
+(define-method set_label
+  (of-object "GtkMenuItem")
+  (c-name "gtk_menu_item_set_label")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "label")
+  )
+)
+
+(define-method get_label
+  (of-object "GtkMenuItem")
+  (c-name "gtk_menu_item_get_label")
+  (return-type "const-gchar*")
+)
+
+(define-method set_use_underline
+  (of-object "GtkMenuItem")
+  (c-name "gtk_menu_item_set_use_underline")
+  (return-type "none")
+  (parameters
+    '("gboolean" "setting")
+  )
+)
+
+(define-method get_use_underline
+  (of-object "GtkMenuItem")
+  (c-name "gtk_menu_item_get_use_underline")
+  (return-type "gboolean")
+)
+
 (define-method remove_submenu
   (of-object "GtkMenuItem")
   (c-name "gtk_menu_item_remove_submenu")
@@ -16081,7 +16443,7 @@
   (is-constructor-of "GtkObject")
   (return-type "GtkObject*")
   (parameters
-    '("GtkType" "type")
+    '("GType" "type")
     '("const-gchar*" "first_property_name")
   )
   (varargs #t)
@@ -16255,7 +16617,7 @@
   (return-type "none")
   (parameters
     '("const-gchar*" "arg_name")
-    '("GtkType" "arg_type")
+    '("GType" "arg_type")
     '("guint" "arg_flags")
     '("guint" "arg_id")
   )
@@ -16267,7 +16629,7 @@
 
 (define-function gtk_old_editable_get_type
   (c-name "gtk_old_editable_get_type")
-  (return-type "GtkType")
+  (return-type "GType")
 )
 
 (define-method claim_selection
@@ -16339,6 +16701,30 @@
 
 
 
+;; From gtkorientable.h
+
+(define-function gtk_orientable_get_type
+  (c-name "gtk_orientable_get_type")
+  (return-type "GType")
+)
+
+(define-method set_orientation
+  (of-object "GtkOrientable")
+  (c-name "gtk_orientable_set_orientation")
+  (return-type "none")
+  (parameters
+    '("GtkOrientation" "orientation")
+  )
+)
+
+(define-method get_orientation
+  (of-object "GtkOrientable")
+  (c-name "gtk_orientable_get_orientation")
+  (return-type "GtkOrientation")
+)
+
+
+
 ;; From gtkpagesetup.h
 
 (define-function gtk_page_setup_get_type
@@ -16904,7 +17290,7 @@
 
 (define-function gtk_pixmap_get_type
   (c-name "gtk_pixmap_get_type")
-  (return-type "GtkType")
+  (return-type "GType")
 )
 
 (define-function gtk_pixmap_new
@@ -17020,7 +17406,7 @@
 
 (define-function gtk_preview_get_type
   (c-name "gtk_preview_get_type")
-  (return-type "GtkType")
+  (return-type "GType")
 )
 
 (define-function gtk_preview_uninit
@@ -18066,6 +18452,18 @@
   (return-type "none")
 )
 
+(define-method draw_page_finish
+  (of-object "GtkPrintOperation")
+  (c-name "gtk_print_operation_draw_page_finish")
+  (return-type "none")
+)
+
+(define-method set_defer_drawing
+  (of-object "GtkPrintOperation")
+  (c-name "gtk_print_operation_set_defer_drawing")
+  (return-type "none")
+)
+
 (define-function gtk_print_run_page_setup_dialog
   (c-name "gtk_print_run_page_setup_dialog")
   (return-type "GtkPageSetup*")
@@ -18569,6 +18967,43 @@
   )
 )
 
+(define-method get_resolution_x
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_get_resolution_x")
+  (return-type "gint")
+)
+
+(define-method get_resolution_y
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_get_resolution_y")
+  (return-type "gint")
+)
+
+(define-method set_resolution_xy
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_set_resolution_xy")
+  (return-type "none")
+  (parameters
+    '("gint" "resolution_x")
+    '("gint" "resolution_y")
+  )
+)
+
+(define-method get_printer_lpi
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_get_printer_lpi")
+  (return-type "gdouble")
+)
+
+(define-method set_printer_lpi
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_set_printer_lpi")
+  (return-type "none")
+  (parameters
+    '("gdouble" "lpi")
+  )
+)
+
 (define-method get_scale
   (of-object "GtkPrintSettings")
   (c-name "gtk_print_settings_get_scale")
@@ -19046,7 +19481,7 @@
   (return-type "none")
   (parameters
     '("gdouble" "value")
-    '("gdouble" "hmin")
+    '("gdouble" "min")
     '("gdouble" "max")
   )
 )
@@ -20613,6 +21048,12 @@
   )
 )
 
+(define-method get_metric
+  (of-object "GtkRuler")
+  (c-name "gtk_ruler_get_metric")
+  (return-type "GtkMetricType")
+)
+
 (define-method set_range
   (of-object "GtkRuler")
   (c-name "gtk_ruler_set_range")
@@ -20625,24 +21066,6 @@
   )
 )
 
-(define-method draw_ticks
-  (of-object "GtkRuler")
-  (c-name "gtk_ruler_draw_ticks")
-  (return-type "none")
-)
-
-(define-method draw_pos
-  (of-object "GtkRuler")
-  (c-name "gtk_ruler_draw_pos")
-  (return-type "none")
-)
-
-(define-method get_metric
-  (of-object "GtkRuler")
-  (c-name "gtk_ruler_get_metric")
-  (return-type "GtkMetricType")
-)
-
 (define-method get_range
   (of-object "GtkRuler")
   (c-name "gtk_ruler_get_range")
@@ -20655,6 +21078,18 @@
   )
 )
 
+(define-method draw_ticks
+  (of-object "GtkRuler")
+  (c-name "gtk_ruler_draw_ticks")
+  (return-type "none")
+)
+
+(define-method draw_pos
+  (of-object "GtkRuler")
+  (c-name "gtk_ruler_draw_pos")
+  (return-type "none")
+)
+
 
 
 ;; From gtkscalebutton.h
@@ -20716,21 +21151,6 @@
   )
 )
 
-(define-method get_orientation
-  (of-object "GtkScaleButton")
-  (c-name "gtk_scale_button_get_orientation")
-  (return-type "GtkOrientation")
-)
-
-(define-method set_orientation
-  (of-object "GtkScaleButton")
-  (c-name "gtk_scale_button_set_orientation")
-  (return-type "none")
-  (parameters
-    '("GtkOrientation" "orientation")
-  )
-)
-
 (define-method get_plus_button
   (of-object "GtkScaleButton")
   (c-name "gtk_scale_button_get_plus_button")
@@ -20749,6 +21169,21 @@
   (return-type "GtkWidget*")
 )
 
+(define-method get_orientation
+  (of-object "GtkScaleButton")
+  (c-name "gtk_scale_button_get_orientation")
+  (return-type "GtkOrientation")
+)
+
+(define-method set_orientation
+  (of-object "GtkScaleButton")
+  (c-name "gtk_scale_button_set_orientation")
+  (return-type "none")
+  (parameters
+    '("GtkOrientation" "orientation")
+  )
+)
+
 
 
 ;; From gtkscale.h
@@ -21160,6 +21595,12 @@
   )
 )
 
+(define-method get_selection
+  (of-object "GtkSelectionData")
+  (c-name "gtk_selection_data_get_selection")
+  (return-type "GdkAtom")
+)
+
 (define-method get_target
   (of-object "GtkSelectionData")
   (c-name "gtk_selection_data_get_target")
@@ -21582,12 +22023,12 @@
   (parameters
     '("const-gchar*" "name")
     '("GtkSignalRunType" "signal_flags")
-    '("GtkType" "object_type")
+    '("GType" "object_type")
     '("guint" "function_offset")
-    '("GtkSignalMarshaller" "marshaller")
-    '("GtkType" "return_val")
+    '("GSignalCMarshaller" "marshaller")
+    '("GType" "return_val")
     '("guint" "n_args")
-    '("GtkType*" "args")
+    '("GType*" "args")
   )
 )
 
@@ -21597,10 +22038,10 @@
   (parameters
     '("const-gchar*" "name")
     '("GtkSignalRunType" "signal_flags")
-    '("GtkType" "object_type")
+    '("GType" "object_type")
     '("guint" "function_offset")
-    '("GtkSignalMarshaller" "marshaller")
-    '("GtkType" "return_val")
+    '("GSignalCMarshaller" "marshaller")
+    '("GType" "return_val")
     '("guint" "n_args")
   )
   (varargs #t)
@@ -21621,7 +22062,7 @@
   (parameters
     '("GtkObject*" "object")
     '("const-gchar*" "name")
-    '("GtkSignalFunc" "func")
+    '("GCallback" "func")
     '("GtkObject*" "alive_object")
   )
 )
@@ -21632,7 +22073,7 @@
   (parameters
     '("GtkObject*" "object")
     '("const-gchar*" "name")
-    '("GtkSignalFunc" "func")
+    '("GCallback" "func")
     '("gpointer" "func_data")
     '("GtkObject*" "alive_object")
   )
@@ -21644,7 +22085,7 @@
   (parameters
     '("GtkObject*" "object")
     '("const-gchar*" "name")
-    '("GtkSignalFunc" "func")
+    '("GCallback" "func")
     '("GtkCallbackMarshal" "unsupported")
     '("gpointer" "data")
     '("GDestroyNotify" "destroy_func")
@@ -21698,7 +22139,7 @@
   (return-type "none")
   (parameters
     '("GtkObject*" "object")
-    '("GtkSignalFunc" "func")
+    '("GCallback" "func")
     '("gpointer" "data")
     '("GSignalMatchType" "match")
     '("guint" "action")
@@ -22262,6 +22703,33 @@
   )
 )
 
+(define-method set_has_tooltip
+  (of-object "GtkStatusIcon")
+  (c-name "gtk_status_icon_set_has_tooltip")
+  (return-type "none")
+  (parameters
+    '("gboolean" "has_tooltip")
+  )
+)
+
+(define-method set_tooltip_text
+  (of-object "GtkStatusIcon")
+  (c-name "gtk_status_icon_set_tooltip_text")
+  (return-type "none")
+  (parameters
+    '("const-char*" "text")
+  )
+)
+
+(define-method set_tooltip_markup
+  (of-object "GtkStatusIcon")
+  (c-name "gtk_status_icon_set_tooltip_markup")
+  (return-type "none")
+  (parameters
+    '("const-char*" "markup")
+  )
+)
+
 (define-method set_visible
   (of-object "GtkStatusIcon")
   (c-name "gtk_status_icon_set_visible")
@@ -22321,6 +22789,24 @@
   )
 )
 
+(define-method get_has_tooltip
+  (of-object "GtkStatusIcon")
+  (c-name "gtk_status_icon_get_has_tooltip")
+  (return-type "gboolean")
+)
+
+(define-method get_tooltip_text
+  (of-object "GtkStatusIcon")
+  (c-name "gtk_status_icon_get_tooltip_text")
+  (return-type "gchar*")
+)
+
+(define-method get_tooltip_markup
+  (of-object "GtkStatusIcon")
+  (c-name "gtk_status_icon_get_tooltip_markup")
+  (return-type "gchar*")
+)
+
 (define-method get_x11_window_id
   (of-object "GtkStatusIcon")
   (c-name "gtk_status_icon_get_x11_window_id")
@@ -23194,6 +23680,39 @@
   (return-type "none")
 )
 
+(define-method get_property
+  (of-object "GtkStyle")
+  (c-name "gtk_style_get_property")
+  (return-type "none")
+  (parameters
+    '("GType" "widget_type")
+    '("const-gchar*" "property_name")
+    '("GValue*" "value")
+  )
+)
+
+(define-method get_valist
+  (of-object "GtkStyle")
+  (c-name "gtk_style_get_valist")
+  (return-type "none")
+  (parameters
+    '("GType" "widget_type")
+    '("const-gchar*" "first_property_name")
+    '("va_list" "var_args")
+  )
+)
+
+(define-method get
+  (of-object "GtkStyle")
+  (c-name "gtk_style_get")
+  (return-type "none")
+  (parameters
+    '("GType" "widget_type")
+    '("const-gchar*" "first_property_name")
+  )
+  (varargs #t)
+)
+
 (define-function gtk_draw_string
   (c-name "gtk_draw_string")
   (return-type "none")
@@ -24327,7 +24846,7 @@
 
 (define-function gtk_text_get_type
   (c-name "gtk_text_get_type")
-  (return-type "GtkType")
+  (return-type "GType")
 )
 
 (define-function gtk_text_new
@@ -26351,7 +26870,7 @@
 
 (define-function gtk_tips_query_get_type
   (c-name "gtk_tips_query_get_type")
-  (return-type "GtkType")
+  (return-type "GType")
 )
 
 (define-function gtk_tips_query_new
@@ -26636,36 +27155,6 @@
   )
 )
 
-(define-method get_orientation
-  (of-object "GtkToolbar")
-  (c-name "gtk_toolbar_get_orientation")
-  (return-type "GtkOrientation")
-)
-
-(define-method set_orientation
-  (of-object "GtkToolbar")
-  (c-name "gtk_toolbar_set_orientation")
-  (return-type "none")
-  (parameters
-    '("GtkOrientation" "orientation")
-  )
-)
-
-(define-method get_tooltips
-  (of-object "GtkToolbar")
-  (c-name "gtk_toolbar_get_tooltips")
-  (return-type "gboolean")
-)
-
-(define-method set_tooltips
-  (of-object "GtkToolbar")
-  (c-name "gtk_toolbar_set_tooltips")
-  (return-type "none")
-  (parameters
-    '("gboolean" "enable")
-  )
-)
-
 (define-method get_style
   (of-object "GtkToolbar")
   (c-name "gtk_toolbar_get_style")
@@ -26693,6 +27182,21 @@
   (return-type "GtkIconSize")
 )
 
+(define-method set_icon_size
+  (of-object "GtkToolbar")
+  (c-name "gtk_toolbar_set_icon_size")
+  (return-type "none")
+  (parameters
+    '("GtkIconSize" "icon_size")
+  )
+)
+
+(define-method unset_icon_size
+  (of-object "GtkToolbar")
+  (c-name "gtk_toolbar_unset_icon_size")
+  (return-type "none")
+)
+
 (define-method get_relief_style
   (of-object "GtkToolbar")
   (c-name "gtk_toolbar_get_relief_style")
@@ -26719,19 +27223,34 @@
   )
 )
 
-(define-method set_icon_size
+(define-method get_orientation
   (of-object "GtkToolbar")
-  (c-name "gtk_toolbar_set_icon_size")
+  (c-name "gtk_toolbar_get_orientation")
+  (return-type "GtkOrientation")
+)
+
+(define-method set_orientation
+  (of-object "GtkToolbar")
+  (c-name "gtk_toolbar_set_orientation")
   (return-type "none")
   (parameters
-    '("GtkIconSize" "icon_size")
+    '("GtkOrientation" "orientation")
   )
 )
 
-(define-method unset_icon_size
+(define-method get_tooltips
   (of-object "GtkToolbar")
-  (c-name "gtk_toolbar_unset_icon_size")
+  (c-name "gtk_toolbar_get_tooltips")
+  (return-type "gboolean")
+)
+
+(define-method set_tooltips
+  (of-object "GtkToolbar")
+  (c-name "gtk_toolbar_set_tooltips")
   (return-type "none")
+  (parameters
+    '("gboolean" "enable")
+  )
 )
 
 (define-method append_item
@@ -26743,7 +27262,7 @@
     '("const-char*" "tooltip_text")
     '("const-char*" "tooltip_private_text")
     '("GtkWidget*" "icon")
-    '("GtkSignalFunc" "callback")
+    '("GCallback" "callback")
     '("gpointer" "user_data")
   )
 )
@@ -26757,7 +27276,7 @@
     '("const-char*" "tooltip_text")
     '("const-char*" "tooltip_private_text")
     '("GtkWidget*" "icon")
-    '("GtkSignalFunc" "callback")
+    '("GCallback" "callback")
     '("gpointer" "user_data")
   )
 )
@@ -26771,7 +27290,7 @@
     '("const-char*" "tooltip_text")
     '("const-char*" "tooltip_private_text")
     '("GtkWidget*" "icon")
-    '("GtkSignalFunc" "callback")
+    '("GCallback" "callback")
     '("gpointer" "user_data")
     '("gint" "position")
   )
@@ -26785,7 +27304,7 @@
     '("const-gchar*" "stock_id")
     '("const-char*" "tooltip_text")
     '("const-char*" "tooltip_private_text")
-    '("GtkSignalFunc" "callback")
+    '("GCallback" "callback")
     '("gpointer" "user_data")
     '("gint" "position")
   )
@@ -26832,7 +27351,7 @@
     '("const-char*" "tooltip_text")
     '("const-char*" "tooltip_private_text")
     '("GtkWidget*" "icon")
-    '("GtkSignalFunc" "callback")
+    '("GCallback" "callback")
     '("gpointer" "user_data")
   )
 )
@@ -26848,7 +27367,7 @@
     '("const-char*" "tooltip_text")
     '("const-char*" "tooltip_private_text")
     '("GtkWidget*" "icon")
-    '("GtkSignalFunc" "callback")
+    '("GCallback" "callback")
     '("gpointer" "user_data")
   )
 )
@@ -26864,7 +27383,7 @@
     '("const-char*" "tooltip_text")
     '("const-char*" "tooltip_private_text")
     '("GtkWidget*" "icon")
-    '("GtkSignalFunc" "callback")
+    '("GCallback" "callback")
     '("gpointer" "user_data")
     '("gint" "position")
   )
@@ -27509,7 +28028,7 @@
 
 (define-function gtk_tree_get_type
   (c-name "gtk_tree_get_type")
-  (return-type "GtkType")
+  (return-type "GType")
 )
 
 (define-function gtk_tree_new
@@ -27652,7 +28171,7 @@
 
 (define-function gtk_tree_item_get_type
   (c-name "gtk_tree_item_get_type")
-  (return-type "GtkType")
+  (return-type "GType")
 )
 
 (define-function gtk_tree_item_new
@@ -30222,11 +30741,21 @@
   (return-type "GType")
 )
 
+(define-function gtk_entry_icon_position_get_type
+  (c-name "gtk_entry_icon_position_get_type")
+  (return-type "GType")
+)
+
 (define-function gtk_anchor_type_get_type
   (c-name "gtk_anchor_type_get_type")
   (return-type "GType")
 )
 
+(define-function gtk_arrow_placement_get_type
+  (c-name "gtk_arrow_placement_get_type")
+  (return-type "GType")
+)
+
 (define-function gtk_arrow_type_get_type
   (c-name "gtk_arrow_type_get_type")
   (return-type "GType")

Modified: trunk/gtk/src/imagemenuitem.hg
==============================================================================
--- trunk/gtk/src/imagemenuitem.hg	(original)
+++ trunk/gtk/src/imagemenuitem.hg	Fri Jan 16 09:49:29 2009
@@ -21,6 +21,7 @@
 
 #include <gtkmm/menuitem.h>
 #include <gtkmm/stockid.h>
+#include <gtkmm/accelgroup.h>
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/menuitem_p.h)
 
@@ -50,6 +51,15 @@
   _WRAP_METHOD(void set_image(Widget& image), gtk_image_menu_item_set_image)
   _WRAP_METHOD(Widget* get_image(), gtk_image_menu_item_get_image)
   _WRAP_METHOD(const Widget* get_image() const, gtk_image_menu_item_get_image, constversion)
+
+  _WRAP_METHOD(void set_use_stock(bool use_stock = true), gtk_image_menu_item_set_use_stock)
+  _WRAP_METHOD(bool get_use_stock() const, gtk_image_menu_item_get_use_stock)
+  _WRAP_METHOD(void set_accel_group(const Glib::RefPtr<AccelGroup>& accel_group), gtk_image_menu_item_set_accel_group)
+
+  _WRAP_PROPERTY("image", Widget*)
+  _WRAP_PROPERTY("use-stock", bool)
+  _WRAP_PROPERTY("accel-group", Glib::RefPtr<AcceGroup>)
+
 };
 
 } /* namespace Gtk */

Modified: trunk/gtk/src/menuitem.hg
==============================================================================
--- trunk/gtk/src/menuitem.hg	(original)
+++ trunk/gtk/src/menuitem.hg	Fri Jan 16 09:49:29 2009
@@ -69,6 +69,10 @@
   _WRAP_METHOD(void set_accel_path(const Glib::ustring& accel_path), gtk_menu_item_set_accel_path)
   void unset_accel_path();
   _WRAP_METHOD(Glib::ustring get_accel_path() const, gtk_menu_item_get_accel_path)
+  _WRAP_METHOD(void set_label(const Glib::ustring& label), gtk_menu_item_set_label)
+  _WRAP_METHOD(Glib::ustring get_label() const, gtk_menu_item_get_label)
+  _WRAP_METHOD(void set_use_underline(bool setting = true), gtk_menu_item_set_use_underline)
+  _WRAP_METHOD(bool get_use_underline() const, gtk_menu_item_get_use_underline)
 
   _WRAP_SIGNAL(void activate(), "activate")
   _WRAP_SIGNAL(void activate_item(), "activate_item")
@@ -79,6 +83,9 @@
 
   _WRAP_PROPERTY("right-justified", bool)
   _WRAP_PROPERTY("submenu", Gtk::Menu*)
+  _WRAP_PROPERTY("accel-path", Glib::ustring)
+  _WRAP_PROPERTY("label", Glib::ustring)
+  _WRAP_PROPERTY("use-underline", bool)
 
 
 protected:

Modified: trunk/gtk/src/printoperation.hg
==============================================================================
--- trunk/gtk/src/printoperation.hg	(original)
+++ trunk/gtk/src/printoperation.hg	Fri Jan 16 09:49:29 2009
@@ -102,6 +102,9 @@
   _WRAP_METHOD(void cancel(), gtk_print_operation_cancel)
   _WRAP_METHOD(bool is_finished() const, gtk_print_operation_is_finished)
 
+  _WRAP_METHOD(void draw_page_finish(), gtk_print_operation_draw_page_finish)
+  _WRAP_METHOD(void set_defer_drawing(), gtk_print_operation_set_defer_drawing)
+
   _IGNORE(gtk_print_run_page_setup_dialog, gtk_print_run_page_setup_dialog_async)
 
   #m4 _CONVERSION(`GtkPrintOperationResult',`PrintOperationResult',`($2)$3')

Modified: trunk/gtk/src/printsettings.hg
==============================================================================
--- trunk/gtk/src/printsettings.hg	(original)
+++ trunk/gtk/src/printsettings.hg	Fri Jan 16 09:49:29 2009
@@ -279,6 +279,12 @@
   _WRAP_METHOD(int get_resolution() const, gtk_print_settings_get_resolution)
   _WRAP_METHOD(void set_resolution(int resolution), gtk_print_settings_set_resolution)
 
+  _WRAP_METHOD(int get_resolution_x() const, gtk_print_settings_get_resolution_x)
+  _WRAP_METHOD(int get_resolution_y() const, gtk_print_settings_get_resolution_y)
+  _WRAP_METHOD(void set_resolution_xy(int resolution_x, int resolution_y), gtk_print_settings_set_resolution_xy)
+  _WRAP_METHOD(double get_printer_lpi() const, gtk_print_settings_get_printer_lpi)
+  _WRAP_METHOD(void set_printer_lpi(double lpi), gtk_print_settings_set_printer_lpi)
+
   _WRAP_METHOD(double get_scale() const, gtk_print_settings_get_scale)
   _WRAP_METHOD(void set_scale(double scale), gtk_print_settings_set_scale)
 

Modified: trunk/gtk/src/statusicon.hg
==============================================================================
--- trunk/gtk/src/statusicon.hg	(original)
+++ trunk/gtk/src/statusicon.hg	Fri Jan 16 09:49:29 2009
@@ -156,6 +156,13 @@
   bool get_geometry(Glib::RefPtr<Gdk::Screen>& screen, Gdk::Rectangle& area, Orientation& orientation);
   _IGNORE(gtk_status_icon_get_geometry)
 
+  _WRAP_METHOD(bool get_has_tooltip() const, gtk_status_icon_get_has_tooltip)
+  _WRAP_METHOD(void set_has_tooltip(bool has_tooltip = true), gtk_status_icon_set_has_tooltip)
+  _WRAP_METHOD(Glib::ustring get_tooltip_text() const, gtk_status_icon_get_tooltip_text)
+  _WRAP_METHOD(void set_tooltip_text(const Glib::ustring& text), gtk_status_icon_set_tooltip_text)
+  _WRAP_METHOD(Glib::ustring get_tooltip_markup() const, gtk_status_icon_get_tooltip_markup)
+  _WRAP_METHOD(void set_tooltip_markup(const Glib::ustring& markup), gtk_status_icon_set_tooltip_markup)
+
   _WRAP_METHOD(guint32 get_x11_window_id() const, gtk_status_icon_get_x11_window_id)
 
   _WRAP_PROPERTY("pixbuf", Glib::RefPtr<Gdk::Pixbuf>)

Modified: trunk/gtk/src/textbuffer.hg
==============================================================================
--- trunk/gtk/src/textbuffer.hg	(original)
+++ trunk/gtk/src/textbuffer.hg	Fri Jan 16 09:49:29 2009
@@ -485,6 +485,10 @@
   _WRAP_METHOD(void begin_user_action(), gtk_text_buffer_begin_user_action)
   _WRAP_METHOD(void end_user_action(), gtk_text_buffer_end_user_action)
 
+//TODO:
+  //_WRAP_METHOD(GtkTargetList * gtk_text_buffer_get_copy_target_list() const, gtk_text_buffer_get_copy_target_list)
+  //_WRAP_METHOD(GtkTargetList * gtk_text_buffer_get_paste_target_list() const, gtk_text_buffer_get_paste_target_list)
+
 
 
   //These are only available on the Maemo platform (patched Gtk+):

Modified: trunk/gtk/src/textview.hg
==============================================================================
--- trunk/gtk/src/textview.hg	(original)
+++ trunk/gtk/src/textview.hg	Fri Jan 16 09:49:29 2009
@@ -234,6 +234,7 @@
   _WRAP_PROPERTY("buffer", Glib::RefPtr<TextBuffer>)
   _WRAP_PROPERTY("overwrite", bool)
   _WRAP_PROPERTY("accepts-tab", bool)
+  _WRAP_PROPERTY("im-module", Glib::ustring)
 };
 
 } /* namespace Gtk */

Modified: trunk/tools/m4/convert_gtk.m4
==============================================================================
--- trunk/tools/m4/convert_gtk.m4	(original)
+++ trunk/tools/m4/convert_gtk.m4	Fri Jan 16 09:49:29 2009
@@ -127,6 +127,7 @@
 _CONV_ENUM(Gtk,PrintCapabilities)
 _CONV_ENUM(Gtk,DragResult)
 _CONV_ENUM(Gtk,NumberUpLayout)
+_CONV_ENUM(Gtk,EntryIconPosition)
 
 _CONVERSION(`GtkIconSize',`IconSize',`IconSize(static_cast<int>($3))')
 _CONVERSION(`GtkIconSize',`Gtk::IconSize',`Gtk::IconSize(static_cast<int>($3))')
@@ -624,6 +625,7 @@
 
 _CONVERSION(`const Glib::RefPtr<const Gio::Icon>&',`GIcon*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gio::Icon))
 _CONVERSION(`GIcon*',`Glib::RefPtr<Gio::Icon>',`Glib::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<Gio::Icon>&',`GIcon*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gio::Icon))
 _CONVERSION(`const Glib::RefPtr<const Gio::File>&',`GFile*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gio::File))
 _CONVERSION(`GFile*',`Glib::RefPtr<Gio::File>',`Glib::wrap($3)')
 _CONVERSION(`GFile*',`Glib::RefPtr<const Gio::File>',`Glib::wrap($3)')
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]