pygtk r3010 - in trunk: . gtk

[gianmt svn gnome org]

Author: gianmt
Date: Sat Jul 26 08:20:50 2008
New Revision: 3010
URL: http://svn.gnome.org/viewvc/pygtk?rev=3010&view=rev

Log:
Add GTK+ 2.14 API, fixes #544777

Added:
   trunk/gtk/gdk-2.14.defs
   trunk/gtk/gtk-2.14-types.defs
   trunk/gtk/gtk-2.14.defs
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gtk/Makefile.am
   trunk/gtk/gdk-base-types.defs
   trunk/gtk/gdk.override
   trunk/gtk/gtk.override

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Jul 26 08:20:50 2008
@@ -3,8 +3,8 @@
 
 dnl the pygtk version number
 m4_define(pygtk_major_version, 2)
-m4_define(pygtk_minor_version, 12)
-m4_define(pygtk_micro_version, 2)
+m4_define(pygtk_minor_version, 13)
+m4_define(pygtk_micro_version, 0)
 m4_define(pygtk_version, pygtk_major_version.pygtk_minor_version.pygtk_micro_version)
 
 dnl versions of packages we require ...
@@ -266,6 +266,23 @@
   AC_SUBST(HAVE_GTK_2_12)
   AC_DEFINE([HAVE_GTK_2_12], [$have_gtk_212], [If Gtk 2.12 was found])
 
+  dnl check for gtk 2.14
+  PKG_CHECK_MODULES(GTK214, gtk+-2.0 >= 2.13.4,
+	  HAVE_GTK_214="yes", HAVE_GTK_214="no")
+  
+  if test "x$HAVE_GTK_214" = "xyes"; then
+     gtk_version="2.14"	
+     have_gtk_214=true
+     PYGTK_CODEGEN_DEFINES="$PYGTK_CODEGEN_DEFINES -DHAVE_GTK_2_14"
+  else
+     AC_MSG_RESULT(no)
+     have_gtk_214=false
+  fi
+	
+  AM_CONDITIONAL(HAVE_GTK_2_14, $have_gtk_214)
+  AC_SUBST(HAVE_GTK_2_14)
+  AC_DEFINE([HAVE_GTK_2_14], [$have_gtk_214], [If Gtk 2.14 was found])
+
   dnl libglade
   PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= libglade_required_version],
 	  have_libglade=true, have_libglade=false)
@@ -293,6 +310,7 @@
   AM_CONDITIONAL(BUILD_GTK, false)
   AM_CONDITIONAL(HAVE_GTK_2_10, false)
   AM_CONDITIONAL(HAVE_GTK_2_12, false)
+  AM_CONDITIONAL(HAVE_GTK_2_14, false)
   AM_CONDITIONAL(BUILD_LIBGLADE, false)
   AM_CONDITIONAL(BUILD_GTKUNIXPRINT, false)
   have_pangocairo=false

Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am	(original)
+++ trunk/gtk/Makefile.am	Sat Jul 26 08:20:50 2008
@@ -48,6 +48,7 @@
 
 GTK_2_10_DEFS = gdk-2.10.defs gtk-2.10.defs gtk-2.10-types.defs
 GTK_2_12_DEFS = gdk-2.12.defs gtk-2.12.defs gtk-2.12-types.defs
+GTK_2_14_DEFS = gdk-2.14.defs gtk-2.14.defs gtk-2.14-types.defs
 
 if HAVE_GTK_2_10
 GDK_DEFS += gdk-2.10.defs 
@@ -61,6 +62,13 @@
 GTK_TYPES_DEFS += gtk-2.12-types.defs
 endif
 
+
+if HAVE_GTK_2_14
+GDK_DEFS += gdk-2.14.defs 
+GTK_DEFS += gtk-2.14.defs 
+GTK_TYPES_DEFS += gtk-2.14-types.defs
+endif
+
 CREATEDEFS = $(PYTHON) $(CODEGENDIR)/createdefs.py
 
 GDK_OVERRIDES = \
@@ -104,6 +112,8 @@
 	$(GTK_DEFS) 		\
 	$(GTK_TYPES_DEFS)	\
 	$(GTK_2_10_DEFS)	\
+	$(GTK_2_12_DEFS)	\
+	$(GTK_2_14_DEFS)	\
 	$(GTK_OVERRIDES)
 
 

Added: trunk/gtk/gdk-2.14.defs
==============================================================================
--- (empty file)
+++ trunk/gtk/gdk-2.14.defs	Sat Jul 26 08:20:50 2008
@@ -0,0 +1,129 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From gdkapplaunchcontext.h
+
+(define-function gdk_app_launch_context_get_type
+  (c-name "gdk_app_launch_context_get_type")
+  (return-type "GType")
+)
+
+(define-function gdk_app_launch_context_new
+  (c-name "gdk_app_launch_context_new")
+  (is-constructor-of "GdkAppLaunchContext")
+  (return-type "GdkAppLaunchContext*")
+)
+
+(define-method set_display
+  (of-object "GdkAppLaunchContext")
+  (c-name "gdk_app_launch_context_set_display")
+  (return-type "none")
+  (parameters
+    '("GdkDisplay*" "display")
+  )
+)
+
+(define-method set_screen
+  (of-object "GdkAppLaunchContext")
+  (c-name "gdk_app_launch_context_set_screen")
+  (return-type "none")
+  (parameters
+    '("GdkScreen*" "screen")
+  )
+)
+
+(define-method set_desktop
+  (of-object "GdkAppLaunchContext")
+  (c-name "gdk_app_launch_context_set_desktop")
+  (return-type "none")
+  (parameters
+    '("gint" "desktop")
+  )
+)
+
+(define-method set_timestamp
+  (of-object "GdkAppLaunchContext")
+  (c-name "gdk_app_launch_context_set_timestamp")
+  (return-type "none")
+  (parameters
+    '("guint32" "timestamp")
+  )
+)
+
+(define-method set_icon
+  (of-object "GdkAppLaunchContext")
+  (c-name "gdk_app_launch_context_set_icon")
+  (return-type "none")
+  (parameters
+    '("GIcon*" "icon")
+  )
+)
+
+(define-method set_icon_name
+  (of-object "GdkAppLaunchContext")
+  (c-name "gdk_app_launch_context_set_icon_name")
+  (return-type "none")
+  (parameters
+    '("const-char*" "icon_name")
+  )
+)
+
+
+
+;; From gdkscreen.h
+
+(define-method get_monitor_width_mm
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_get_monitor_width_mm")
+  (return-type "gint")
+  (parameters
+    '("gint" "monitor_num")
+  )
+)
+
+(define-method get_monitor_height_mm
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_get_monitor_height_mm")
+  (return-type "gint")
+  (parameters
+    '("gint" "monitor_num")
+  )
+)
+
+(define-method get_monitor_plug_name
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_get_monitor_plug_name")
+  (return-type "gchar*")
+  (parameters
+    '("gint" "monitor_num")
+  )
+)
+
+
+
+;; From gdkwindow.h
+
+(define-method remove_redirection
+  (of-object "GdkWindow")
+  (c-name "gdk_window_remove_redirection")
+  (return-type "none")
+)
+
+
+
+(ifdef GDK_TARGET_X11
+ 
+;; From gdkx.h
+
+(define-function x11_screen_get_monitor_output
+  (c-name "gdk_x11_screen_get_monitor_output")
+  (return-type "XID")
+  (parameters
+    '("GdkScreen*" "screen")
+    '("gint" "monitor_num")
+  )
+)
+
+)

Modified: trunk/gtk/gdk-base-types.defs
==============================================================================
--- trunk/gtk/gdk-base-types.defs	(original)
+++ trunk/gtk/gdk-base-types.defs	Sat Jul 26 08:20:50 2008
@@ -1,5 +1,12 @@
 ;; -*- scheme -*-
 ; object definitions ...
+(define-object AppLaunchContext
+  (in-module "Gdk")
+  (parent "GAppLaunchContext")
+  (c-name "GdkAppLaunchContext")
+  (gtype-id "GDK_TYPE_APP_LAUNCH_CONTEXT")
+)
+
 (define-object Colormap
   (in-module "Gdk")
   (parent "GObject")

Modified: trunk/gtk/gdk.override
==============================================================================
--- trunk/gtk/gdk.override	(original)
+++ trunk/gtk/gdk.override	Sat Jul 26 08:20:50 2008
@@ -92,6 +92,7 @@
 import pango.Font as PyPangoFont_Type
 import pango.Layout as PyPangoLayout_Type
 import pango.Renderer as PyPangoRenderer_Type
+import gio.AppLaunchContext as PyGAppLaunchContext_Type
 %%
 ignore
   gdk_window_set_debug_updates

Added: trunk/gtk/gtk-2.14-types.defs
==============================================================================
--- (empty file)
+++ trunk/gtk/gtk-2.14-types.defs	Sat Jul 26 08:20:50 2008
@@ -0,0 +1,14 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-object MountOperation
+  (in-module "Gtk")
+  (parent "GMountOperation")
+  (c-name "GtkMountOperation")
+  (gtype-id "GTK_TYPE_MOUNT_OPERATION")
+)
+
+(define-interface ToolShell
+  (in-module "Gtk")
+  (c-name "GtkToolShell")
+  (gtype-id "GTK_TYPE_TOOL_SHELL")
+)

Added: trunk/gtk/gtk-2.14.defs
==============================================================================
--- (empty file)
+++ trunk/gtk/gtk-2.14.defs	Sat Jul 26 08:20:50 2008
@@ -0,0 +1,733 @@
+;; -*- scheme -*-
+
+(include "gtk-2.14-types.defs")
+
+;; From gtkaccelgroup.h
+
+(define-method get_is_locked
+  (of-object "GtkAccelGroup")
+  (c-name "gtk_accel_group_get_is_locked")
+  (return-type "gboolean")
+)
+
+(define-method get_modifier_mask
+  (of-object "GtkAccelGroup")
+  (c-name "gtk_accel_group_get_modifier_mask")
+  (return-type "GdkModifierType")
+)
+
+
+
+;; From gtkbuilder.h
+
+(define-method add_objects_from_file
+  (of-object "GtkBuilder")
+  (c-name "gtk_builder_add_objects_from_file")
+  (return-type "guint")
+  (parameters
+    '("const-gchar*" "filename")
+    '("gchar**" "object_ids")
+    '("GError**" "error")
+  )
+)
+
+(define-method add_objects_from_string
+  (of-object "GtkBuilder")
+  (c-name "gtk_builder_add_objects_from_string")
+  (return-type "guint")
+  (parameters
+    '("const-gchar*" "buffer")
+    '("gsize" "length")
+    '("gchar**" "object_ids")
+    '("GError**" "error")
+  )
+)
+
+
+
+;; From gtkcalendar.h
+
+(define-method set_detail_func
+  (of-object "GtkCalendar")
+  (c-name "gtk_calendar_set_detail_func")
+  (return-type "none")
+  (parameters
+    '("GtkCalendarDetailFunc" "func")
+    '("gpointer" "data")
+    '("GDestroyNotify" "destroy")
+  )
+)
+
+(define-method set_detail_width_chars
+  (of-object "GtkCalendar")
+  (c-name "gtk_calendar_set_detail_width_chars")
+  (return-type "none")
+  (parameters
+    '("gint" "chars")
+  )
+)
+
+(define-method set_detail_height_rows
+  (of-object "GtkCalendar")
+  (c-name "gtk_calendar_set_detail_height_rows")
+  (return-type "none")
+  (parameters
+    '("gint" "rows")
+  )
+)
+
+(define-method get_detail_width_chars
+  (of-object "GtkCalendar")
+  (c-name "gtk_calendar_get_detail_width_chars")
+  (return-type "gint")
+)
+
+(define-method get_detail_height_rows
+  (of-object "GtkCalendar")
+  (c-name "gtk_calendar_get_detail_height_rows")
+  (return-type "gint")
+)
+
+
+
+;; From gtkclipboard.h
+
+(define-method wait_is_uris_available
+  (of-object "GtkClipboard")
+  (c-name "gtk_clipboard_wait_is_uris_available")
+  (return-type "gboolean")
+)
+
+(define-method wait_for_uris
+  (of-object "GtkClipboard")
+  (c-name "gtk_clipboard_wait_for_uris")
+  (return-type "gchar**")
+)
+
+(define-method request_uris
+  (of-object "GtkClipboard")
+  (c-name "gtk_clipboard_request_uris")
+  (return-type "none")
+  (parameters
+    '("GtkClipboardURIReceivedFunc" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+
+
+;; From gtkcolorseldialog.h
+
+(define-method get_color_selection
+  (of-object "GtkColorSelectionDialog")
+  (c-name "gtk_color_selection_dialog_get_color_selection")
+  (return-type "GtkWidget*")
+)
+
+
+
+;; From gtkcontainer.h
+
+(define-method get_focus_child
+  (of-object "GtkContainer")
+  (c-name "gtk_container_get_focus_child")
+  (return-type "GtkWidget*")
+)
+
+
+
+;; From gtkdialog.h
+
+(define-method get_action_area
+  (of-object "GtkDialog")
+  (c-name "gtk_dialog_get_action_area")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_content_area
+  (of-object "GtkDialog")
+  (c-name "gtk_dialog_get_content_area")
+  (return-type "GtkWidget*")
+)
+
+
+
+;; From gtkentry.h
+
+(define-method set_overwrite_mode
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_overwrite_mode")
+  (return-type "none")
+  (parameters
+    '("gboolean" "overwrite")
+  )
+)
+
+(define-method get_overwrite_mode
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_overwrite_mode")
+  (return-type "gboolean")
+)
+
+(define-method get_text_length
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_text_length")
+  (return-type "guint16")
+)
+
+
+
+;; From gtkfontsel.h
+
+(define-method get_ok_button
+  (of-object "GtkFontSelectionDialog")
+  (c-name "gtk_font_selection_dialog_get_ok_button")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_apply_button
+  (of-object "GtkFontSelectionDialog")
+  (c-name "gtk_font_selection_dialog_get_apply_button")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_cancel_button
+  (of-object "GtkFontSelectionDialog")
+  (c-name "gtk_font_selection_dialog_get_cancel_button")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_family_entry
+  (of-object "GtkFontSelection")
+  (c-name "gtk_font_selection_get_family_entry")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_family_list
+  (of-object "GtkFontSelection")
+  (c-name "gtk_font_selection_get_family_list")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_face_entry
+  (of-object "GtkFontSelection")
+  (c-name "gtk_font_selection_get_face_entry")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_face_list
+  (of-object "GtkFontSelection")
+  (c-name "gtk_font_selection_get_face_list")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_size_entry
+  (of-object "GtkFontSelection")
+  (c-name "gtk_font_selection_get_size_entry")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_size_list
+  (of-object "GtkFontSelection")
+  (c-name "gtk_font_selection_get_size_list")
+  (return-type "GtkWidget*")
+)
+(define-method get_preview_entry
+  (of-object "GtkFontSelection")
+  (c-name "gtk_font_selection_get_preview_entry")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_family
+  (of-object "GtkFontSelection")
+  (c-name "gtk_font_selection_get_family")
+  (return-type "PangoFontFamily*")
+)
+
+(define-method get_face
+  (of-object "GtkFontSelection")
+  (c-name "gtk_font_selection_get_face")
+  (return-type "PangoFontFace*")
+)
+
+(define-method get_size
+  (of-object "GtkFontSelection")
+  (c-name "gtk_font_selection_get_size")
+  (return-type "gint")
+)
+
+
+
+;; From gtkhandlebox.h
+
+(define-method get_child_detached
+  (of-object "GtkHandleBox")
+  (c-name "gtk_handle_box_get_child_detached")
+  (return-type "gboolean")
+)
+
+
+
+;; From gtkicontheme.h
+
+(define-function icon_info_new_for_pixbuf
+  (c-name "gtk_icon_info_new_for_pixbuf")
+  (return-type "GtkIconInfo*")
+  (parameters
+    '("GtkIconTheme*" "icon_theme")
+    '("GdkPixbuf*" "pixbuf")
+  )
+)
+
+(define-method lookup_by_gicon
+  (of-object "GtkIconTheme")
+  (c-name "gtk_icon_theme_lookup_by_gicon")
+  (return-type "GtkIconInfo*")
+  (parameters
+    '("GIcon*" "icon")
+    '("gint" "size")
+    '("GtkIconLookupFlags" "flags")
+  )
+)
+
+
+
+;; From gtkimage.h
+
+(define-method set_from_gicon
+  (of-object "GtkImage")
+  (c-name "gtk_image_set_from_gicon")
+  (return-type "none")
+  (parameters
+    '("GIcon*" "icon")
+    '("GtkIconSize" "size")
+  )
+)
+
+(define-function image_new_from_gicon
+  (c-name "gtk_image_new_from_gicon")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GIcon*" "icon")
+    '("GtkIconSize" "size")
+  )
+)
+
+(define-method get_gicon
+  (of-object "GtkImage")
+  (c-name "gtk_image_get_gicon")
+  (return-type "none")
+  (parameters
+    '("GIcon**" "gicon")
+    '("GtkIconSize*" "size")
+  )
+)
+
+
+
+;; From gtklayout.h
+
+(define-method get_bin_window
+  (of-object "GtkLayout")
+  (c-name "gtk_layout_get_bin_window")
+  (return-type "GdkWindow*")
+)
+
+
+
+;; From gtkmenu.h
+
+(define-method get_accel_path
+  (of-object "GtkMenu")
+  (c-name "gtk_menu_get_accel_path")
+  (return-type "const-gchar*")
+)
+
+(define-method get_monitor
+  (of-object "GtkMenu")
+  (c-name "gtk_menu_get_monitor")
+  (return-type "gint")
+)
+
+
+
+;; From gtkmenuitem.h
+
+(define-method get_accel_path
+  (of-object "GtkMenuItem")
+  (c-name "gtk_menu_item_get_accel_path")
+  (return-type "const-gchar*")
+)
+
+
+
+;; From gtkmessagedialog.h
+
+(define-method get_image
+  (of-object "GtkMessageDialog")
+  (c-name "gtk_message_dialog_get_image")
+  (return-type "GtkWidget*")
+)
+
+
+
+;; From gtkmountoperation.h
+
+(define-function gtk_mount_operation_get_type
+  (c-name "gtk_mount_operation_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_mount_operation_new
+  (c-name "gtk_mount_operation_new")
+  (is-constructor-of "GtkMountOperation")
+  (return-type "GMountOperation*")
+  (parameters
+    '("GtkWindow*" "parent")
+  )
+)
+
+(define-method is_showing
+  (of-object "GtkMountOperation")
+  (c-name "gtk_mount_operation_is_showing")
+  (return-type "gboolean")
+)
+
+(define-method set_parent
+  (of-object "GtkMountOperation")
+  (c-name "gtk_mount_operation_set_parent")
+  (return-type "none")
+  (parameters
+    '("GtkWindow*" "parent")
+  )
+)
+
+(define-method get_parent
+  (of-object "GtkMountOperation")
+  (c-name "gtk_mount_operation_get_parent")
+  (return-type "GtkWindow*")
+)
+
+(define-method set_screen
+  (of-object "GtkMountOperation")
+  (c-name "gtk_mount_operation_set_screen")
+  (return-type "none")
+  (parameters
+    '("GdkScreen*" "screen")
+  )
+)
+
+(define-method get_screen
+  (of-object "GtkMountOperation")
+  (c-name "gtk_mount_operation_get_screen")
+  (return-type "GdkScreen*")
+)
+
+
+
+;; From gtkplug.h
+
+(define-method get_embedded
+  (of-object "GtkPlug")
+  (c-name "gtk_plug_get_embedded")
+  (return-type "gboolean")
+)
+
+(define-method get_socket_window
+  (of-object "GtkPlug")
+  (c-name "gtk_plug_get_socket_window")
+  (return-type "GdkWindow*")
+)
+
+
+
+;; From gtkpagesetup.h
+
+(define-method load_key_file
+  (of-object "GtkPageSetup")
+  (c-name "gtk_page_setup_load_key_file")
+  (return-type "gboolean")
+  (parameters
+    '("GKeyFile*" "key_file")
+    '("const-gchar*" "group_name")
+    '("GError**" "error")
+  )
+)
+
+(define-method load_file
+  (of-object "GtkPageSetup")
+  (c-name "gtk_page_setup_load_file")
+  (return-type "gboolean")
+  (parameters
+    '("const-char*" "file_name")
+    '("GError**" "error")
+  )
+)
+
+
+
+;; From gtkprintsettings.h
+
+(define-method load_key_file
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_load_key_file")
+  (return-type "gboolean")
+  (parameters
+    '("GKeyFile*" "key_file")
+    '("const-gchar*" "group_name")
+    '("GError**" "error")
+  )
+)
+
+(define-method load_file
+  (of-object "GtkPrintSettings")
+  (c-name "gtk_print_settings_load_file")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "file_name")
+    '("GError**" "error")
+  )
+)
+
+
+
+;; From gtkscalebutton.h
+
+(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")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_minus_button
+  (of-object "GtkScaleButton")
+  (c-name "gtk_scale_button_get_minus_button")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_popup
+  (of-object "GtkScaleButton")
+  (c-name "gtk_scale_button_get_popup")
+  (return-type "GtkWidget*")
+)
+
+
+
+;; From gtkselection.h
+
+(define-method get_target
+  (of-object "GtkSelectionData")
+  (c-name "gtk_selection_data_get_target")
+  (return-type "GdkAtom")
+)
+
+(define-method get_data_type
+  (of-object "GtkSelectionData")
+  (c-name "gtk_selection_data_get_data_type")
+  (return-type "GdkAtom")
+)
+
+(define-method get_format
+  (of-object "GtkSelectionData")
+  (c-name "gtk_selection_data_get_format")
+  (return-type "gint")
+)
+
+(define-method get_data
+  (of-object "GtkSelectionData")
+  (c-name "gtk_selection_data_get_data")
+  (return-type "const-guchar*")
+  (parameters
+    '("guint*" "length")
+  )
+)
+
+(define-method get_display
+  (of-object "GtkSelectionData")
+  (c-name "gtk_selection_data_get_display")
+  (return-type "GdkDisplay*")
+)
+
+
+
+;; From gtkshow.h
+
+(define-function show_uri
+  (c-name "gtk_show_uri")
+  (return-type "gboolean")
+  (parameters
+    '("GdkScreen*" "screen")
+    '("const-gchar*" "uri")
+    '("guint32" "timestamp")
+    '("GError**" "error")
+  )
+)
+
+
+
+;; From gtksocket.h
+
+(define-method get_plug_window
+  (of-object "GtkSocket")
+  (c-name "gtk_socket_get_plug_window")
+  (return-type "GdkWindow*")
+)
+
+
+
+;; From gtkstatusicon.h
+
+(define-method get_x11_window_id
+  (of-object "GtkStatusIcon")
+  (c-name "gtk_status_icon_get_x11_window_id")
+  (return-type "guint32")
+)
+
+
+
+;; From gtktooltip.h
+
+(define-method set_icon_from_icon_name
+  (of-object "GtkTooltip")
+  (c-name "gtk_tooltip_set_icon_from_icon_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "icon_name")
+    '("GtkIconSize" "size")
+  )
+)
+
+
+
+;; From gtktoolitem.h
+
+(define-method toolbar_reconfigured
+  (of-object "GtkToolItem")
+  (c-name "gtk_tool_item_toolbar_reconfigured")
+  (return-type "none")
+)
+
+
+
+;; From gtktoolshell.h
+
+(define-method get_icon_size
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_get_icon_size")
+  (return-type "GtkIconSize")
+)
+
+(define-method get_orientation
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_get_orientation")
+  (return-type "GtkOrientation")
+)
+
+(define-method get_style
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_get_style")
+  (return-type "GtkToolbarStyle")
+)
+
+(define-method get_relief_style
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_get_relief_style")
+  (return-type "GtkReliefStyle")
+)
+
+(define-method rebuild_menu
+  (of-object "GtkToolShell")
+  (c-name "gtk_tool_shell_rebuild_menu")
+  (return-type "none")
+)
+
+(define-virtual get_icon_size
+  (of-object "GtkToolShell")
+  (return-type "GtkIconSize")
+)
+
+(define-virtual get_orientation
+  (of-object "GtkToolShell")
+  (return-type "GtkOrientation")
+)
+
+(define-virtual get_style
+  (of-object "GtkToolShell")
+  (return-type "GtkToolbarStyle")
+)
+
+(define-virtual get_relief_style
+  (of-object "GtkToolShell")
+  (return-type "GtkReliefStyle")
+)
+
+(define-virtual rebuild_menu
+  (of-object "GtkToolShell")
+  (return-type "none")
+)
+
+
+
+;; From gtktreeselection.h
+
+(define-method get_select_function
+  (of-object "GtkTreeSelection")
+  (c-name "gtk_tree_selection_get_select_function")
+  (return-type "GtkTreeSelectionFunc")
+)
+
+
+
+;; From gtkwidget.h
+
+(define-method get_snapshot
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_snapshot")
+  (return-type "GdkPixmap*")
+  (parameters
+    '("GdkRectangle*" "clip_rect")
+  )
+)
+
+(define-method get_allocation
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_allocation")
+  (return-type "GtkAllocation")
+)
+
+(define-method get_window
+  (of-object "GtkWidget")
+  (c-name "gtk_widget_get_window")
+  (return-type "GdkWindow*")
+)
+
+
+
+;; From gtkwindow.h
+
+(define-method get_default
+  (of-object "GtkWindow")
+  (c-name "gtk_window_get_default")
+  (return-type "GtkWidget*")
+)
+
+(define-method list_windows
+  (of-object "GtkWindowGroup")
+  (c-name "gtk_window_group_list_windows")
+  (return-type "GList*")
+)

Modified: trunk/gtk/gtk.override
==============================================================================
--- trunk/gtk/gtk.override	(original)
+++ trunk/gtk/gtk.override	Sat Jul 26 08:20:50 2008
@@ -125,6 +125,7 @@
 import pango.Context as PyPangoContext_Type
 import pango.Font as PyPangoFont_Type
 import pango.Layout as PyPangoLayout_Type
+import gio.MountOperation as PyGMountOperation_Type
 %%
 ignore
   gtk_accel_group_add