LMPX.COM :: Elizabeth Marie Smith :: cvs: php-gtk /ext/gtk+ gdk-2.12.overrides gdk-2.8-types.defs gdk-2.8.defs gdk-types.defs gdk.defs pango-types.defs

LMPX.COM
From: Elizabeth Marie Smith Date: Sat Jul 12 17:55:10 2008

Subject: cvs: php-gtk /ext/gtk+ gdk-2.12.overrides gdk-2.8-types.defs gdk-2.8.defs gdk-types.defs gdk.defs pango-types.defs
auroraeosrose		Sat Jul 12 23:55:10 2008 UTC

  Added files:                 
    /php-gtk/ext/gtk+	gdk-2.8-types.defs gdk-2.8.defs 

  Modified files:              
    /php-gtk/ext/gtk+	gdk-2.12.overrides gdk-types.defs gdk.defs 
                     	pango-types.defs 
  Log:
  major overhaul of gdk defs, they are now synced to gtk and 2.8 defs that were missing were added, including cairo support - the pango definition is temporary until I get pango versioning working properly
  
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk-2.12.overrides?r1=1.2&r2=1.3&diff_format=u
Index: php-gtk/ext/gtk+/gdk-2.12.overrides
diff -u php-gtk/ext/gtk+/gdk-2.12.overrides:1.2 php-gtk/ext/gtk+/gdk-2.12.overrides:1.3
--- php-gtk/ext/gtk+/gdk-2.12.overrides:1.2	Tue Jan 22 18:47:34 2008
+++ php-gtk/ext/gtk+/gdk-2.12.overrides	Sat Jul 12 23:55:09 2008
@@ -2,6 +2,9 @@
 %% include gdk.overrides
 
 %%
+ignore-glob
+    gdk_threads_*
+%%
 ignore-win32
-   gdk_x11_display_get_startup_notification_id 
+   gdk_x11_*
 %% }}}
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk-types.defs?r1=1.7&r2=1.8&diff_format=u
Index: php-gtk/ext/gtk+/gdk-types.defs
diff -u php-gtk/ext/gtk+/gdk-types.defs:1.7 php-gtk/ext/gtk+/gdk-types.defs:1.8
--- php-gtk/ext/gtk+/gdk-types.defs:1.7	Sat Jun 10 04:27:53 2006
+++ php-gtk/ext/gtk+/gdk-types.defs	Sat Jul 12 23:55:10 2008
@@ -906,6 +906,18 @@
   )
 )
 
+(define-enum PixbufRotation
+  (in-module "Gdk")
+  (c-name "GdkPixbufRotation")
+  (gtype-id "GDK_TYPE_PIXBUF_ROTATION")
+  (values
+    '("none" "GDK_PIXBUF_ROTATE_NONE")
+    '("counterclockwise" "GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE")
+    '("upsidedown" "GDK_PIXBUF_ROTATE_UPSIDEDOWN")
+    '("clockwise" "GDK_PIXBUF_ROTATE_CLOCKWISE")
+  )
+)
+
 (define-enum InterpType
   (in-module "Gdk")
   (c-name "GdkInterpType")
@@ -917,3 +929,14 @@
     '("hyper" "GDK_INTERP_HYPER")
   )
 )
+
+(define-enum OwnerChange
+  (in-module "Gdk")
+  (c-name "GdkOwnerChange")
+  (gtype-id "GDK_TYPE_OWNER_CHANGE")
+  (values
+    '("new-owner" "GDK_OWNER_CHANGE_NEW_OWNER")
+    '("destroy" "GDK_OWNER_CHANGE_DESTROY")
+    '("close" "GDK_OWNER_CHANGE_CLOSE")
+  )
+)
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gdk.defs?r1=1.26&r2=1.27&diff_format=u
Index: php-gtk/ext/gtk+/gdk.defs
diff -u php-gtk/ext/gtk+/gdk.defs:1.26 php-gtk/ext/gtk+/gdk.defs:1.27
--- php-gtk/ext/gtk+/gdk.defs:1.26	Tue Jan 22 20:43:06 2008
+++ php-gtk/ext/gtk+/gdk.defs	Sat Jul 12 23:55:10 2008
@@ -1,529 +1,599 @@
 (include "gdk-types.defs")
 
-;; Functions, constructors, and methods ...
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdk.h
 
-(define-function gdk_add_client_message_filter
-  (c-name "gdk_add_client_message_filter")
+(define-function notify_startup_complete
+  (c-name "gdk_notify_startup_complete")
   (return-type "none")
-  (parameters
-    '("GdkAtom" "message_type")
-    '("GdkFilterFunc" "func")
-    '("gpointer" "data")
-  )
 )
 
-(define-function atom_intern
-  (c-name "gdk_atom_intern")
-  (return-type "GdkAtom")
-  (parameters
-    '("gchar*" "atom_name")
-    '("gboolean" "only_if_exists" (default "FALSE"))
-  )
+(define-function get_display_arg_name
+  (c-name "gdk_get_display_arg_name")
+  (return-type "const-gchar*")
 )
 
-(define-method name
-  (of-object "GdkAtom")
-  (c-name "gdk_atom_name")
-  (caller-owns-return #t)
-  (return-type "gchar*")
+(define-function get_program_class
+  (c-name "gdk_get_program_class")
+  (return-type "const-gchar*")
 )
 
-(define-function beep
-  (c-name "gdk_beep")
-  (return-type "none")
+(define-function set_program_class
+  (c-name "gdk_set_program_class")
+  (parameters
+    '("const-gchar*" "program_class")
+  )
 )
 
-(define-function bitmap_create_from_data
-  (c-name "gdk_bitmap_create_from_data")
-  (return-type "GdkBitmap*")
+(define-function get_display
+  (c-name "gdk_get_display")
+  (return-type "const-gchar*")
+)
+
+(define-function pointer_grab
+  (c-name "gdk_pointer_grab")
+  (return-type "GdkGrabStatus")
   (parameters
-    '("GdkDrawable*" "drawable" (null-ok))
-    '("const-guchar*" "data")
-    '("gint" "width")
-    '("gint" "height")
+    '("GdkWindow*" "window")
+    '("gboolean" "owner_events" (default "FALSE") (null-ok))
+    '("GdkEventMask" "event_mask" (null-ok))
+    '("GdkWindow*" "confine_to" (default "NULL") (null-ok))
+    '("GdkCursor*" "cursor" (default "NULL") (null-ok))
+    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
   )
 )
 
-(define-method char_height
-  (of-object "GdkFont")
-  (c-name "gdk_char_height")
-  (return-type "gint")
+(define-function pointer_ungrab
+  (c-name "gdk_pointer_ungrab")
+  (return-type "none")
   (parameters
-    '("gchar" "character")
+    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
   )
 )
 
-(define-method char_measure
-  (of-object "GdkFont")
-  (c-name "gdk_char_measure")
-  (return-type "gint")
+(define-function keyboard_grab
+  (c-name "gdk_keyboard_grab")
+  (return-type "GdkGrabStatus")
   (parameters
-    '("gchar" "character")
+    '("GdkWindow*" "window")
+    '("gboolean" "owner_events" (default "FALSE") (null-ok))
+    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
   )
 )
 
-(define-method char_width
-  (of-object "GdkFont")
-  (c-name "gdk_char_width")
-  (return-type "gint")
+(define-function keyboard_ungrab
+  (c-name "gdk_keyboard_ungrab")
+  (return-type "none")
   (parameters
-    '("gchar" "character")
+    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
   )
 )
 
-(define-method char_width_wc
-  (of-object "GdkFont")
-  (c-name "gdk_char_width_wc")
+(define-function pointer_is_grabbed
+  (c-name "gdk_pointer_is_grabbed")
+  (return-type "gboolean")
+)
+
+(define-method width
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_width")
   (return-type "gint")
-  (parameters
-    '("GdkWChar" "character")
-  )
+  (static #t)
 )
 
-(define-method alloc
-  (of-object "GdkColormap")
-  (c-name "gdk_color_alloc")
+(define-method height
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_height")
   (return-type "gint")
-  (parameters
-    '("GdkColor*" "color")
-  )
+  (static #t)
 )
 
-(define-method black
-  (of-object "GdkColormap")
-  (c-name "gdk_color_black")
+(define-method width_mm
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_width_mm")
   (return-type "gint")
-  (parameters
-    '("GdkColor*" "color")
-  )
+  (static #t)
 )
 
-(define-method change
-  (of-object "GdkColormap")
-  (c-name "gdk_color_change")
+(define-method height_mm
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_height_mm")
   (return-type "gint")
+  (static #t)
+)
+
+(define-function flush
+  (c-name "gdk_flush")
+  (return-type "none")
+)
+
+(define-function beep
+  (c-name "gdk_beep")
+  (return-type "none")
+)
+
+(define-function set_double_click_time
+  (c-name "gdk_set_double_click_time")
+  (return-type "none")
   (parameters
-    '("GdkColor*" "color")
+    '("guint" "msec")
   )
 )
 
-(define-function gdk_color_new
-  (is-constructor-of "GdkColor")
-  (c-name "gdk_color_new")
-  (caller-owns-return #t)
-  (return-type "GdkColor")
+(define-function threads_enter
+  (c-name "gdk_threads_enter")
+  (return-type "none")
 )
 
-(define-method color_parse
-  (c-name "gdk_color_parse")
-  (of-object "GdkColor")
-  (return-type "gint")
+(define-function threads_leave
+  (c-name "gdk_threads_leave")
+  (return-type "none")
+)
+
+(define-function threads_init
+  (c-name "gdk_threads_init")
+  (return-type "none")
+)
+
+(define-function parse_args
+  (c-name "gdk_parse_args")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "spec")
-    '("GdkColor*" "color")
+    '("gint*" "argc")
+    '("gchar***" "argv")
   )
-  (static #t)
 )
 
-(define-method white
-  (of-object "GdkColormap")
-  (c-name "gdk_color_white")
-  (return-type "gint")
+(define-function init
+  (c-name "gdk_init")
+  (return-type "none")
   (parameters
-    '("GdkColor*" "color")
+    '("gint*" "argc")
+    '("gchar***" "argv")
   )
 )
 
-(define-method alloc_color
-  (of-object "GdkColormap")
-  (c-name "gdk_colormap_alloc_color")
+(define-function init_check
+  (c-name "gdk_init_check")
   (return-type "gboolean")
   (parameters
-    '("GdkColor*" "color")
-    '("gboolean" "writeable")
-    '("gboolean" "best_match")
+    '("gint*" "argc")
+    '("gchar***" "argv")
   )
 )
 
-(define-method get_screen
-  (of-object "GdkColormap")
-  (c-name "gdk_colormap_get_screen")
-  (return-type "GdkScreen*")
+(define-function exit
+  (c-name "gdk_exit")
+  (return-type "none")
+  (parameters
+    '("gint" "error_code")
+  )
 )
 
-(define-method get_system
-  (of-object "GdkColormap")
-  (c-name "gdk_colormap_get_system")
-  (return-type "GdkColormap*")
-  (static #t)
+(define-function set_locale
+  (c-name "gdk_set_locale")
+  (return-type "gchar*")
+)
+(define-function error_trap_push
+  (c-name "gdk_error_trap_push")
+  (return-type "none")
 )
 
-(define-function colormap_get_system_size
-  (c-name "gdk_colormap_get_system_size")
+(define-function error_trap_pop
+  (c-name "gdk_error_trap_pop")
   (return-type "gint")
-  (deprecated "")
 )
 
-(define-function gdk_colormap_get_type
-  (c-name "gdk_colormap_get_type")
-  (return-type "GType")
+(define-function set_use_xshm
+  (c-name "gdk_set_use_xshm")
+  (return-type "none")
+  (parameters
+    '("gboolean" "use_xshm")
+  )
 )
 
-(define-method get_visual
-  (of-object "GdkColormap")
-  (c-name "gdk_colormap_get_visual")
-  (return-type "GdkVisual*")
+(define-function get_use_xshm
+  (c-name "gdk_get_use_xshm")
+  (return-type "gboolean")
 )
 
-(define-function gdk_colormap_new
-  (is-constructor-of "GdkColormap")
-  (c-name "gdk_colormap_new")
-  (caller-owns-return #t)
-  (return-type "GdkColormap*")
+(define-function input_add_full
+  (c-name "gdk_input_add_full")
+  (return-type "gint")
   (parameters
-    '("GdkVisual*" "visual")
-    '("gboolean" "allocate")
+    '("gint" "source")
+    '("GdkInputCondition" "condition")
+    '("GdkInputFunction" "function")
+    '("gpointer" "data")
+    '("GdkDestroyNotify" "destroy")
   )
 )
 
-(define-method query_color
-  (of-object "GdkColormap")
-  (c-name "gdk_colormap_query_color")
+(define-function input_add
+  (c-name "gdk_input_add")
+  (return-type "gint")
   (parameters
-    '("gulong" "pixel")
-    '("GdkColor*" "color")
+    '("gint" "source")
+    '("GdkInputCondition" "condition")
+    '("GdkInputFunction" "function")
+    '("gpointer" "data")
   )
 )
 
-(define-method get_display
-  (of-object "GdkCursor")
-  (c-name "gdk_cursor_get_display")
-  (return-type "GdkDisplay*")
+(define-function input_remove
+  (c-name "gdk_input_remove")
+  (return-type "none")
+  (parameters
+    '("gint" "tag")
+  )
 )
 
-(define-function cursor_new
-  (is-constructor-of "GdkCursor")
-  (c-name "gdk_cursor_new")
-  (caller-owns-return #t)
-  (return-type "GdkCursor*")
+(define-function rectangle_get_type
+  (c-name "gdk_rectangle_get_type")
+  (return-type "GType")
+)
+
+(define-function wcstombs
+  (c-name "gdk_wcstombs")
+  (return-type "gchar*")
   (parameters
-    '("GdkCursorType" "cursor_type")
+    '("const-GdkWChar*" "src")
   )
 )
 
-(define-function cursor_new_for_display
-  (is-constructor-of "GdkCursor")
-  (c-name "gdk_cursor_new_for_display")
-  (caller-owns-return #t)
-  (return-type "GdkCursor*")
+(define-function mbstowcs
+  (c-name "gdk_mbstowcs")
+  (return-type "gint")
   (parameters
-    '("GdkDisplay*" "display")
-    '("GdkCursorType" "cursor_type")
+    '("GdkWChar*" "dest")
+    '("const-gchar*" "src")
+    '("gint" "dest_max")
   )
 )
 
-(define-function cursor_new_from_pixbuf
-  (is-constructor-of "GdkCursor")
-  (c-name "gdk_cursor_new_from_pixbuf")
-  (caller-owns-return #t)
-  (return-type "GdkCursor*")
+(define-method send_client_message
+  (of-object "GdkEvent")
+  (c-name "gdk_event_send_client_message")
+  (return-type "gboolean")
   (parameters
-    '("GdkDisplay*" "display")
-    '("GdkPixbuf*" "source")
-    '("gint" "x")
-    '("gint" "y")
+    '("GdkNativeWindow" "winid")
   )
 )
 
-(define-function cursor_new_from_pixmap
-  (is-constructor-of "GdkCursor")
-  (c-name "gdk_cursor_new_from_pixmap")
-  (caller-owns-return #t)
-  (return-type "GdkCursor*")
-  (parameters
-    '("GdkPixmap*" "source")
-    '("GdkPixmap*" "mask")
-    '("GdkColor*" "fg")
-    '("GdkColor*" "bg")
-    '("gint" "x")
-    '("gint" "y")
-  )
+(define-method send_clientmessage_toall
+  (of-object "GdkEvent")
+  (c-name "gdk_event_send_clientmessage_toall")
+  (return-type "none")
 )
 
-(define-function device_free_history
-  (c-name "gdk_device_free_history")
-  (return-type "none")
+(define-function event_send_client_message_for_display
+  (c-name "gdk_event_send_client_message_for_display")
+  (return-type "gboolean")
   (parameters
-    '("GdkTimeCoord**" "events")
-    '("gint" "n_events")
+    '("GdkDisplay*" "display")
+    '("GdkEvent*" "event")
+    '("GdkNativeWindow" "winid")
   )
 )
 
-(define-method get_axis
-  (of-object "GdkDevice")
-  (c-name "gdk_device_get_axis")
-  (return-type "gboolean")
+(define-function threads_set_lock_functions
+  (c-name "gdk_threads_set_lock_functions")
+  (return-type "none")
   (parameters
-    '("gdouble*" "axes")
-    '("GdkAxisUse" "use")
-    '("gdouble*" "value")
+    '("GCallback" "enter_fn")
+    '("GCallback" "leave_fn")
   )
 )
 
-(define-method get_core_pointer
-  (of-object "GdkDevice")
-  (c-name "gdk_device_get_core_pointer")
-  (return-type "GdkDevice*")
-  (static #t)
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkcolor.h
+
+(define-method ref
+  (of-object "GdkColormap")
+  (c-name "gdk_colormap_ref")
+  (return-type "GdkColormap*")
 )
 
-(define-method get_history
-  (of-object "GdkDevice")
-  (c-name "gdk_device_get_history")
-  (return-type "gboolean")
-  (parameters
-    '("GdkWindow*" "window")
-    '("guint32" "start")
-    '("guint32" "stop")
-    '("GdkTimeCoord***" "events")
-    '("gint*" "n_events")
-  )
+(define-method unref
+  (of-object "GdkColormap")
+  (c-name "gdk_colormap_unref")
+  (return-type "none")
 )
 
-(define-method get_state
-  (of-object "GdkDevice")
-  (c-name "gdk_device_get_state")
+(define-method change
+  (of-object "GdkColormap")
+  (deprecated "deprecated")
+  (c-name "gdk_colormap_change")
   (return-type "none")
   (parameters
-    '("GdkWindow*" "window")
-    '("gdouble*" "axes")
-    '("GdkModifierType*" "mask")
+    '("gint" "ncolors")
   )
 )
 
-(define-function device_get_type
-  (c-name "gdk_device_get_type")
-  (return-type "GType")
+(define-method alloc_colors
+  (of-object "GdkColormap")
+  (c-name "gdk_colormap_alloc_colors")
+  (return-type "gint")
+  (parameters
+    '("GdkColor*" "colors")
+    '("gint" "ncolors")
+    '("gboolean" "writeable")
+    '("gboolean" "best_match")
+    '("gboolean*" "success")
+  )
 )
 
-(define-method set_axis_use
-  (of-object "GdkDevice")
-  (c-name "gdk_device_set_axis_use")
+(define-method free_colors
+  (of-object "GdkColormap")
+  (c-name "gdk_colormap_free_colors")
   (return-type "none")
   (parameters
-    '("guint" "index")
-    '("GdkAxisUse" "use")
+    '("GdkColor*" "colors")
+    '("gint" "ncolors")
   )
 )
 
-(define-method set_key
-  (of-object "GdkDevice")
-  (c-name "gdk_device_set_key")
+(define-method copy
+  (of-object "GdkColor")
+  (c-name "gdk_color_copy")
+  (return-type "GdkColor*")
+)
+
+(define-method free
+  (of-object "GdkColor")
+  (c-name "gdk_color_free")
   (return-type "none")
-  (parameters
-    '("guint" "index")
-    '("guint" "keyval")
-    '("GdkModifierType" "modifiers")
-  )
 )
 
-(define-method set_mode
-  (of-object "GdkDevice")
-  (c-name "gdk_device_set_mode")
+(define-method hash
+  (of-object "GdkColor")
+  (c-name "gdk_color_hash")
+  (return-type "guint")
+)
+
+(define-method equal
+  (of-object "GdkColor")
+  (c-name "gdk_color_equal")
   (return-type "gboolean")
   (parameters
-    '("GdkInputMode" "mode")
+    '("const-GdkColor*" "colorb")
   )
 )
 
-(define-method set_source
-  (of-object "GdkDevice")
-  (c-name "gdk_device_set_source")
+(define-function color_get_type
+  (c-name "gdk_color_get_type")
+  (return-type "GType")
+)
+
+(define-function colors_store
+  (c-name "gdk_colors_store")
   (return-type "none")
   (parameters
-    '("GdkInputSource" "source")
+    '("GdkColormap*" "colormap")
+    '("GdkColor*" "colors")
+    '("gint" "ncolors")
   )
 )
 
-(define-method list_devices
-  (of-object "GdkDevice")
-  (c-name "gdk_devices_list")
-  (return-type "GList*")
-  (static #t)
+(define-function colors_alloc
+  (c-name "gdk_colors_alloc")
+  (return-type "gint")
+  (parameters
+    '("GdkColormap*" "colormap")
+    '("gboolean" "contiguous")
+    '("gulong*" "planes")
+    '("gint" "nplanes")
+    '("gulong*" "pixels")
+    '("gint" "npixels")
+  )
 )
 
-(define-method add_client_message_filter
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_add_client_message_filter")
+(define-function colors_free
+  (c-name "gdk_colors_free")
   (return-type "none")
   (parameters
-    '("GdkAtom" "message_type")
-    '("GdkFilterFunc" "func")
-    '("gpointer" "data")
+    '("GdkColormap*" "colormap")
+    '("gulong*" "pixels")
+    '("gint" "npixels")
+    '("gulong" "planes")
   )
 )
 
-(define-method beep
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_beep")
-  (return-type "none")
+(define-function gdk_color_new
+  (is-constructor-of "GdkColor")
+  (c-name "gdk_color_new")
+  (caller-owns-return #t)
+  (return-type "GdkColor")
 )
 
-(define-method close
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_close")
-  (return-type "none")
+(define-function gdk_colormap_get_type
+  (c-name "gdk_colormap_get_type")
+  (return-type "GType")
 )
 
-(define-method flush
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_flush")
-  (return-type "none")
+(define-function gdk_colormap_new
+  (is-constructor-of "GdkColormap")
+  (c-name "gdk_colormap_new")
+  (caller-owns-return #t)
+  (return-type "GdkColormap*")
+  (parameters
+    '("GdkVisual*" "visual")
+    '("gboolean" "allocate")
+  )
 )
 
-(define-method get_core_pointer
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_core_pointer")
-  (return-type "GdkDevice*")
+(define-method get_system
+  (of-object "GdkColormap")
+  (c-name "gdk_colormap_get_system")
+  (return-type "GdkColormap*")
+  (static #t)
 )
 
-(define-method get_default
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_default")
-  (return-type "GdkDisplay*")
-  (static #t)
+(define-function colormap_get_system_size
+  (c-name "gdk_colormap_get_system_size")
+  (return-type "gint")
+  (deprecated "")
 )
 
-(define-method get_default_cursor_size
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_default_cursor_size")
-  (return-type "guint")
+(define-method alloc_color
+  (of-object "GdkColormap")
+  (c-name "gdk_colormap_alloc_color")
+  (return-type "gboolean")
+  (parameters
+    '("GdkColor*" "color")
+    '("gboolean" "writeable")
+    '("gboolean" "best_match")
+  )
 )
 
-(define-method get_default_group
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_default_group")
-  (return-type "GdkWindow*")
+(define-method query_color
+  (of-object "GdkColormap")
+  (c-name "gdk_colormap_query_color")
+  (parameters
+    '("gulong" "pixel")
+    '("GdkColor*" "color")
+  )
 )
 
-(define-method get_default_screen
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_default_screen")
-  (return-type "GdkScreen*")
+(define-method get_visual
+  (of-object "GdkColormap")
+  (c-name "gdk_colormap_get_visual")
+  (return-type "GdkVisual*")
 )
 
-(define-method get_event
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_event")
-  (return-type "GdkEvent*")
+(define-method get_screen
+  (of-object "GdkColormap")
+  (c-name "gdk_colormap_get_screen")
+  (return-type "GdkScreen*")
 )
 
-(define-method get_maximal_cursor_size
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_maximal_cursor_size")
-  (return-type "none")
+(define-method color_parse
+  (c-name "gdk_color_parse")
+  (of-object "GdkColor")
+  (return-type "gint")
   (parameters
-    '("guint*" "width")
-    '("guint*" "height")
+    '("const-gchar*" "spec")
+    '("GdkColor*" "color")
   )
+  (static #t)
 )
 
-(define-method get_n_screens
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_n_screens")
+(define-method white
+  (of-object "GdkColormap")
+  (c-name "gdk_color_white")
   (return-type "gint")
-)
-
-(define-method get_name
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_name")
-  (return-type "const-gchar*")
-)
-
-(define-method get_pointer
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_pointer")
-  (return-type "none")
   (parameters
-    '("GdkScreen**" "screen")
-    '("gint*" "x")
-    '("gint*" "y")
-    '("GdkModifierType*" "mask")
+    '("GdkColor*" "color")
   )
 )
 
-(define-method get_screen
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_screen")
-  (return-type "GdkScreen*")
+(define-method black
+  (of-object "GdkColormap")
+  (c-name "gdk_color_black")
+  (return-type "gint")
   (parameters
-    '("gint" "screen_num")
+    '("GdkColor*" "color")
   )
 )
 
-(define-function gdk_display_get_type
-  (c-name "gdk_display_get_type")
-  (return-type "GType")
-)
-
-(define-method get_window_at_pointer
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_get_window_at_pointer")
-  (return-type "GdkWindow*")
+(define-method alloc
+  (of-object "GdkColormap")
+  (c-name "gdk_color_alloc")
+  (return-type "gint")
   (parameters
-    '("gint*" "win_x")
-    '("gint*" "win_y")
+    '("GdkColor*" "color")
   )
 )
 
-(define-method keyboard_ungrab
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_keyboard_ungrab")
-  (return-type "none")
+(define-method change
+  (of-object "GdkColor")
+  (c-name "gdk_color_change")
+  (return-type "gint")
   (parameters
-    '("guint32" "time_" (default "GDK_CURRENT_TIME"))
+    '("GdkColorMap*" "colormap")
   )
 )
 
-(define-method list_devices
-  (of-object "GdkDisplay")
-  (c-name "gdk_display_list_devices")
-  (return-type "GList*")
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkcursor.h
+
+(define-function cursor_get_type
+  (c-name "gdk_cursor_get_type")
+  (return-type "GType")
 )
 
-(define-method get
-  (of-object "GdkDisplayManager")
-  (c-name "gdk_display_manager_get")
-  (return-type "GdkDisplayManager*")
-  (static #t)
+(define-method ref
+  (of-object "GdkCursor")
+  (c-name "gdk_cursor_ref")
+  (return-type "GdkCursor*")
 )
 
-(define-method get_default_display
-  (of-object "GdkDisplayManager")
-  (c-name "gdk_display_manager_get_default_display")
-  (return-type "GdkDisplay*")
+(define-method unref
+  (of-object "GdkCursor")
+  (c-name "gdk_cursor_unref")
+  (return-type "none")
 )
 
-(define-function gdk_display_manager_get_type
-  (c-name "gdk_display_manager_get_type")
-  (return-type "GType")
+
+(define-function cursor_new
+  (is-constructor-of "GdkCursor")
+  (c-name "gdk_cursor_new")
+  (caller-owns-return #t)
+  (return-type "GdkCursor*")
+  (parameters
+    '("GdkCursorType" "cursor_type")
+  )
 )
 
-(define-method list_displays
-  (of-object "GdkDisplayManager")
-  (c-name "gdk_display_manager_list_displays")
-  (return-type "GSList*")
+(define-function cursor_new_for_display
+  (is-constructor-of "GdkCursor")
+  (c-name "gdk_cursor_new_for_display")
+  (caller-owns-return #t)
+  (return-type "GdkCursor*")
+  (parameters
+    '("GdkDisplay*" "display")
+    '("GdkCursorType" "cursor_type")
+  )
 )
 
-(define-method set_default_display
-  (of-object "GdkDisplayManager")
-  (c-name "gdk_display_manager_set_default_display")
-  (return-type "none")
+(define-function cursor_new_from_pixmap
+  (is-constructor-of "GdkCursor")
+  (c-name "gdk_cursor_new_from_pixmap")
+  (caller-owns-return #t)
+  (return-type "GdkCursor*")
+  (parameters
+    '("GdkPixmap*" "source")
+    '("GdkPixmap*" "mask")
+    '("GdkColor*" "fg")
+    '("GdkColor*" "bg")
+    '("gint" "x")
+    '("gint" "y")
+  )
+)
+
+(define-function cursor_new_from_pixbuf
+  (is-constructor-of "GdkCursor")
+  (c-name "gdk_cursor_new_from_pixbuf")
+  (caller-owns-return #t)
+  (return-type "GdkCursor*")
   (parameters
     '("GdkDisplay*" "display")
+    '("GdkPixbuf*" "source")
+    '("gint" "x")
+    '("gint" "y")
   )
 )
 
+(define-method get_display
+  (of-object "GdkCursor")
+  (c-name "gdk_cursor_get_display")
+  (return-type "GdkDisplay*")
+)
+
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkdisplay.h
+
+(define-function gdk_display_get_type
+  (c-name "gdk_display_get_type")
+  (return-type "GType")
+)
+
 (define-function gdk_display_open
   (is-constructor-of "GdkDisplay")
   (c-name "gdk_display_open")
@@ -534,23 +604,31 @@
   )
 )
 
-(define-method open_default_libgtk_only
+(define-method get_name
   (of-object "GdkDisplay")
-  (c-name "gdk_display_open_default_libgtk_only")
-  (return-type "GdkDisplay*")
-  (static #t)
+  (c-name "gdk_display_get_name")
+  (return-type "const-gchar*")
 )
 
-(define-method peek_event
+(define-method get_n_screens
   (of-object "GdkDisplay")
-  (c-name "gdk_display_peek_event")
-  (return-type "GdkEvent*")
+  (c-name "gdk_display_get_n_screens")
+  (return-type "gint")
 )
 
-(define-method pointer_is_grabbed
+(define-method get_screen
   (of-object "GdkDisplay")
-  (c-name "gdk_display_pointer_is_grabbed")
-  (return-type "gboolean")
+  (c-name "gdk_display_get_screen")
+  (return-type "GdkScreen*")
+  (parameters
+    '("gint" "screen_num")
+  )
+)
+
+(define-method get_default_screen
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_default_screen")
+  (return-type "GdkScreen*")
 )
 
 (define-method pointer_ungrab
@@ -562,30 +640,74 @@
   )
 )
 
-(define-method put_event
+(define-method keyboard_ungrab
   (of-object "GdkDisplay")
-  (c-name "gdk_display_put_event")
+  (c-name "gdk_display_keyboard_ungrab")
   (return-type "none")
   (parameters
-    '("GdkEvent*" "event")
+    '("guint32" "time_" (default "GDK_CURRENT_TIME"))
   )
 )
 
-(define-method request_selection_notification
+(define-method pointer_is_grabbed
   (of-object "GdkDisplay")
-  (c-name "gdk_display_request_selection_notification")
+  (c-name "gdk_display_pointer_is_grabbed")
   (return-type "gboolean")
+)
+
+(define-method beep
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_beep")
+  (return-type "none")
+)
+
+(define-method sync
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_sync")
+  (return-type "none")
+)
+
+(define-method close
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_close")
+  (return-type "none")
+)
+
+(define-method list_devices
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_list_devices")
+  (return-type "GList*")
+)
+
+(define-method get_event
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_event")
+  (return-type "GdkEvent*")
+)
+
+(define-method peek_event
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_peek_event")
+  (return-type "GdkEvent*")
+)
+
+(define-method put_event
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_put_event")
+  (return-type "none")
   (parameters
-    '("GdkAtom" "selection")
+    '("GdkEvent*" "event")
   )
 )
 
-(define-method set_double_click_distance
+(define-method add_client_message_filter
   (of-object "GdkDisplay")
-  (c-name "gdk_display_set_double_click_distance")
+  (c-name "gdk_display_add_client_message_filter")
   (return-type "none")
   (parameters
-    '("guint" "distance")
+    '("GdkAtom" "message_type")
+    '("GdkFilterFunc" "func")
+    '("gpointer" "data")
   )
 )
 
@@ -598,6 +720,41 @@
   )
 )
 
+(define-method get_default
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_default")
+  (return-type "GdkDisplay*")
+  (static #t)
+)
+
+(define-method get_core_pointer
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_core_pointer")
+  (return-type "GdkDevice*")
+)
+
+(define-method get_pointer
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_pointer")
+  (return-type "none")
+  (parameters
+    '("GdkScreen**" "screen")
+    '("gint*" "x")
+    '("gint*" "y")
+    '("GdkModifierType*" "mask")
+  )
+)
+
+(define-method get_window_at_pointer
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_window_at_pointer")
+  (return-type "GdkWindow*")
+  (parameters
+    '("gint*" "win_x")
+    '("gint*" "win_y")
+  )
+)
+
 (define-method set_pointer_hooks
   (of-object "GdkDisplay")
   (c-name "gdk_display_set_pointer_hooks")
@@ -619,54 +776,120 @@
   )
 )
 
-(define-method supports_clipboard_persistence
+(define-method supports_selection_notification
   (of-object "GdkDisplay")
-  (c-name "gdk_display_supports_clipboard_persistence")
+  (c-name "gdk_display_supports_selection_notification")
   (return-type "gboolean")
 )
 
-(define-method supports_cursor_alpha
+(define-method request_selection_notification
   (of-object "GdkDisplay")
-  (c-name "gdk_display_supports_cursor_alpha")
+  (c-name "gdk_display_request_selection_notification")
   (return-type "gboolean")
+  (parameters
+    '("GdkAtom" "selection")
+  )
 )
 
-(define-method supports_cursor_color
+(define-method supports_clipboard_persistence
   (of-object "GdkDisplay")
-  (c-name "gdk_display_supports_cursor_color")
+  (c-name "gdk_display_supports_clipboard_persistence")
   (return-type "gboolean")
 )
 
-(define-method supports_selection_notification
+(define-method flush
   (of-object "GdkDisplay")
-  (c-name "gdk_display_supports_selection_notification")
-  (return-type "gboolean")
+  (c-name "gdk_display_flush")
+  (return-type "none")
 )
 
-(define-method sync
+(define-method set_double_click_distance
   (of-object "GdkDisplay")
-  (c-name "gdk_display_sync")
+  (c-name "gdk_display_set_double_click_distance")
   (return-type "none")
+  (parameters
+    '("guint" "distance")
+  )
 )
 
-(define-method drag_abort
-  (of-object "GdkDragContext")
-  (c-name "gdk_drag_abort")
+(define-method supports_cursor_alpha
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_supports_cursor_alpha")
+  (return-type "gboolean")
+)
+
+(define-method supports_cursor_color
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_supports_cursor_color")
+  (return-type "gboolean")
+)
+
+(define-method get_default_cursor_size
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_default_cursor_size")
+  (return-type "guint")
+)
+
+(define-method get_maximal_cursor_size
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_maximal_cursor_size")
   (return-type "none")
   (parameters
-    '("guint32" "time")
+    '("guint*" "width")
+    '("guint*" "height")
   )
 )
 
-(define-method drag_begin
-  (of-object "GdkWindow")
-  (c-name "gdk_drag_begin")
-  (return-type "GdkDragContext*")
+(define-method get_default_group
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_get_default_group")
+  (return-type "GdkWindow*")
+)
+
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkdisplaymanager.h
+
+(define-function gdk_display_manager_get_type
+  (c-name "gdk_display_manager_get_type")
+  (return-type "GType")
+)
+
+(define-method get
+  (of-object "GdkDisplayManager")
+  (c-name "gdk_display_manager_get")
+  (return-type "GdkDisplayManager*")
+  (static #t)
+)
+
+(define-method get_default_display
+  (of-object "GdkDisplayManager")
+  (c-name "gdk_display_manager_get_default_display")
+  (return-type "GdkDisplay*")
+)
+
+(define-method set_default_display
+  (of-object "GdkDisplayManager")
+  (c-name "gdk_display_manager_set_default_display")
+  (return-type "none")
   (parameters
-    '("GList*" "targets")
+    '("GdkDisplay*" "display")
   )
 )
 
+(define-method list_displays
+  (of-object "GdkDisplayManager")
+  (c-name "gdk_display_manager_list_displays")
+  (return-type "GSList*")
+)
+
+(define-method open_default_libgtk_only
+  (of-object "GdkDisplay")
+  (c-name "gdk_display_open_default_libgtk_only")
+  (return-type "GdkDisplay*")
+  (static #t)
+)
+
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkdnd.h
+
 (define-function drag_context_get_type
   (c-name "gdk_drag_context_get_type")
   (return-type "GType")
@@ -691,45 +914,48 @@
   (return-type "none")
 )
 
-(define-method drag_drop
+(define-method drag_status
   (of-object "GdkDragContext")
-  (c-name "gdk_drag_drop")
+  (c-name "gdk_drag_status")
   (return-type "none")
   (parameters
-    '("guint32" "time")
+    '("GdkDragAction" "action")
+    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
   )
 )
 
-(define-method drag_drop_succeeded
+(define-method drop_reply
   (of-object "GdkDragContext")
-  (c-name "gdk_drag_drop_succeeded")
-  (return-type "gboolean")
+  (c-name "gdk_drop_reply")
+  (return-type "none")
+  (parameters
+    '("gboolean" "ok")
+    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
+  )
 )
 
-(define-method drag_find_window
+(define-method drop_finish
   (of-object "GdkDragContext")
-  (c-name "gdk_drag_find_window")
+  (c-name "gdk_drop_finish")
   (return-type "none")
   (parameters
-    '("GdkWindow*" "drag_window")
-    '("gint" "x_root")
-    '("gint" "y_root")
-    '("GdkWindow**" "dest_window")
-    '("GdkDragProtocol*" "protocol")
+    '("gboolean" "success")
+    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
   )
 )
 
-(define-method drag_find_window_for_screen
+(define-method drag_get_selection
   (of-object "GdkDragContext")
-  (c-name "gdk_drag_find_window_for_screen")
-  (return-type "none")
+  (c-name "gdk_drag_get_selection")
+  (return-type "GdkAtom")
+)
+
+(define-method drag_begin
+  (of-object "GdkWindow")
+  (c-name "gdk_drag_begin")
+  (return-type "GdkDragContext*")
   (parameters
-    '("GdkWindow*" "drag_window")
-    '("GdkScreen*" "screen")
-    '("gint" "x_root")
-    '("gint" "y_root")
-    '("GdkWindow**" "dest_window")
-    '("GdkDragProtocol*" "protocol")
+    '("GList*" "targets")
   )
 )
 
@@ -742,6 +968,19 @@
   )
 )
 
+(define-method drag_find_window
+  (of-object "GdkDragContext")
+  (c-name "gdk_drag_find_window")
+  (return-type "none")
+  (parameters
+    '("GdkWindow*" "drag_window")
+    '("gint" "x_root")
+    '("gint" "y_root")
+    '("GdkWindow**" "dest_window")
+    '("GdkDragProtocol*" "protocol")
+  )
+)
+
 (define-function drag_get_protocol_for_display
   (c-name "gdk_drag_get_protocol_for_display")
   (return-type "guint32")
@@ -751,11 +990,18 @@
     '("GdkDragProtocol*" "protocol")
   )
 )
-
-(define-method drag_get_selection
+(define-method drag_find_window_for_screen
   (of-object "GdkDragContext")
-  (c-name "gdk_drag_get_selection")
-  (return-type "GdkAtom")
+  (c-name "gdk_drag_find_window_for_screen")
+  (return-type "none")
+  (parameters
+    '("GdkWindow*" "drag_window")
+    '("GdkScreen*" "screen")
+    '("gint" "x_root")
+    '("gint" "y_root")
+    '("GdkWindow**" "dest_window")
+    '("GdkDragProtocol*" "protocol")
+  )
 )
 
 (define-method drag_motion
@@ -773,160 +1019,141 @@
   )
 )
 
-(define-method drag_status
+(define-method drag_drop
   (of-object "GdkDragContext")
-  (c-name "gdk_drag_status")
+  (c-name "gdk_drag_drop")
   (return-type "none")
   (parameters
-    '("GdkDragAction" "action")
-    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
+    '("guint32" "time")
   )
 )
 
-(define-method draw_arc
-  (of-object "GdkDrawable")
-  (c-name "gdk_draw_arc")
+(define-method drag_abort
+  (of-object "GdkDragContext")
+  (c-name "gdk_drag_abort")
   (return-type "none")
   (parameters
-    '("GdkGC*" "gc")
-    '("gboolean" "filled")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-    '("gint" "angle1")
-    '("gint" "angle2")
+    '("guint32" "time")
   )
 )
 
-(define-method draw_drawable
+(define-method drag_drop_succeeded
+  (of-object "GdkDragContext")
+  (c-name "gdk_drag_drop_succeeded")
+  (return-type "gboolean")
+)
+
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkdrawable.h
+
+(define-function gdk_drawable_get_type
+  (c-name "gdk_drawable_get_type")
+  (return-type "GType")
+)
+
+(define-method copy_to_image
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_drawable")
-  (return-type "none")
+  (c-name "gdk_drawable_copy_to_image")
+  (return-type "GdkImage*")
   (parameters
-    '("GdkGC*" "gc")
-    '("GdkDrawable*" "src")
-    '("gint" "xsrc")
-    '("gint" "ysrc")
-    '("gint" "xdest")
-    '("gint" "ydest")
+    '("GdkImage*" "image")
+    '("gint" "src_x")
+    '("gint" "src_y")
+    '("gint" "dest_x")
+    '("gint" "dest_y")
     '("gint" "width")
     '("gint" "height")
   )
 )
 
-(define-method draw_glyphs
+(define-method set_data
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_glyphs")
+  (c-name "gdk_drawable_set_data")
   (return-type "none")
   (parameters
-    '("GdkGC*" "gc")
-    '("PangoFont*" "font")
-    '("gint" "x")
-    '("gint" "y")
-    '("PangoGlyphString*" "glyphs")
+    '("const-gchar*" "key")
+    '("gpointer" "data")
+    '("GDestroyNotify" "destroy_func")
   )
 )
 
-(define-method draw_gray_image
+(define-method get_data
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_gray_image")
-  (return-type "none")
+  (c-name "gdk_drawable_get_data")
+  (return-type "gpointer")
   (parameters
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-    '("GdkRgbDither" "dith")
-    '("guchar*" "buf")
-    '("gint" "rowstride")
+    '("const-gchar*" "key")
   )
 )
 
-(define-method draw_image
+(define-method get_size
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_image")
+  (c-name "gdk_drawable_get_size")
   (return-type "none")
   (parameters
-    '("GdkGC*" "gc")
-    '("GdkImage*" "image")
-    '("gint" "xsrc")
-    '("gint" "ysrc")
-    '("gint" "xdest")
-    '("gint" "ydest")
-    '("gint" "width")
-    '("gint" "height")
+    '("gint*" "width")
+    '("gint*" "height")
   )
 )
 
-(define-method draw_indexed_image
+(define-method set_colormap
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_indexed_image")
+  (c-name "gdk_drawable_set_colormap")
   (return-type "none")
   (parameters
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-    '("GdkRgbDither" "dith")
-    '("guchar*" "buf")
-    '("gint" "rowstride")
-    '("GdkRgbCmap*" "cmap")
+    '("GdkColormap*" "colormap")
   )
 )
 
-(define-method draw_layout
+(define-method get_colormap
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_layout")
-  (return-type "none")
-  (parameters
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("PangoLayout*" "layout")
-  )
+  (c-name "gdk_drawable_get_colormap")
+  (return-type "GdkColormap*")
 )
 
-(define-method draw_layout_line
+(define-method get_visual
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_layout_line")
-  (return-type "none")
-  (parameters
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("PangoLayoutLine*" "line")
-  )
+  (c-name "gdk_drawable_get_visual")
+  (return-type "GdkVisual*")
 )
 
-(define-function gdk_draw_layout_line_with_colors
-  (c-name "gdk_draw_layout_line_with_colors")
+(define-method get_depth
+  (of-object "GdkDrawable")
+  (c-name "gdk_drawable_get_depth")
+  (return-type "gint")
+)
+
+(define-method get_screen
+  (of-object "GdkDrawable")
+  (c-name "gdk_drawable_get_screen")
+  (return-type "GdkScreen*")
+)
+
+(define-method get_display
+  (of-object "GdkDrawable")
+  (c-name "gdk_drawable_get_display")
+  (return-type "GdkDisplay*")
+)
+
+(define-method ref
+  (of-object "GdkDrawable")
+  (c-name "gdk_drawable_ref")
+  (return-type "GdkDrawable*")
+)
+
+(define-method unref
+  (of-object "GdkDrawable")
+  (c-name "gdk_drawable_unref")
   (return-type "none")
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("PangoLayoutLine*" "line")
-    '("GdkColor*" "foreground")
-    '("GdkColor*" "background")
-  )
 )
 
-(define-function gdk_draw_layout_with_colors
-  (c-name "gdk_draw_layout_with_colors")
+(define-method draw_point
+  (of-object "GdkDrawable")
+  (c-name "gdk_draw_point")
   (return-type "none")
-  (deprecated "use GdkDrawable::draw_layout() instead")
   (parameters
-    '("GdkDrawable*" "drawable")
     '("GdkGC*" "gc")
     '("gint" "x")
     '("gint" "y")
-    '("PangoLayout*" "layout")
-    '("GdkColor*" "foreground")
-    '("GdkColor*" "background")
   )
 )
 
@@ -943,131 +1170,132 @@
   )
 )
 
-(define-method draw_lines
+(define-method draw_rectangle
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_lines")
+  (c-name "gdk_draw_rectangle")
   (return-type "none")
   (parameters
     '("GdkGC*" "gc")
-    '("GdkPoint*" "points")
-    '("gint" "npoints")
-  )
-)
-
-(define-method draw_pixbuf
-  (of-object "GdkDrawable")
-  (c-name "gdk_draw_pixbuf")
-  (return-type "none")
-  (parameters
-    '("GdkGC*" "gc" (null-ok))
-    '("GdkPixbuf*" "pixbuf" (null-ok))
-    '("gint" "src_x" (null-ok))
-    '("gint" "src_y" (null-ok))
-    '("gint" "dest_x" (null-ok))
-    '("gint" "dest_y" (null-ok))
-    '("gint" "width" (default "-1") (null-ok))
-    '("gint" "height" (default "-1") (null-ok))
-    '("GdkRgbDither" "dither" (default "GDK_RGB_DITHER_NORMAL") (null-ok))
-    '("gint" "x_dither" (null-ok))
-    '("gint" "y_dither" (null-ok))
+    '("gboolean" "filled")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
   )
 )
 
-(define-method draw_point
+(define-method draw_arc
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_point")
+  (c-name "gdk_draw_arc")
   (return-type "none")
   (parameters
     '("GdkGC*" "gc")
+    '("gboolean" "filled")
     '("gint" "x")
     '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("gint" "angle1")
+    '("gint" "angle2")
   )
 )
 
-(define-method draw_points
+(define-method draw_polygon
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_points")
+  (c-name "gdk_draw_polygon")
   (return-type "none")
   (parameters
     '("GdkGC*" "gc")
+    '("gboolean" "filled")
     '("GdkPoint*" "points")
     '("gint" "npoints")
   )
 )
 
-(define-method draw_polygon
+(define-method draw_string
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_polygon")
+  (c-name "gdk_draw_string")
   (return-type "none")
+  (deprecated "use GdkDrawable::draw_layout()")
   (parameters
+    '("GdkFont*" "font")
     '("GdkGC*" "gc")
-    '("gboolean" "filled")
-    '("GdkPoint*" "points")
-    '("gint" "npoints")
+    '("gint" "x")
+    '("gint" "y")
+    '("const-gchar*" "string")
   )
 )
 
-(define-method draw_rectangle
+(define-method draw_text
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_rectangle")
+  (c-name "gdk_draw_text")
   (return-type "none")
+  (deprecated "use GdkDrawable::draw_layout()")
   (parameters
+    '("GdkFont*" "font")
     '("GdkGC*" "gc")
-    '("gboolean" "filled")
     '("gint" "x")
     '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
+    '("const-gchar*" "text")
+    '("gint" "text_length")
   )
 )
 
-(define-method draw_rgb_32_image
+(define-method draw_text_wc
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_rgb_32_image")
+  (c-name "gdk_draw_text_wc")
   (return-type "none")
+  (deprecated "use GdkDrawable::draw_layout()")
   (parameters
+    '("GdkFont*" "font")
     '("GdkGC*" "gc")
     '("gint" "x")
     '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
-    '("GdkRgbDither" "dith")
-    '("guchar*" "buf")
-    '("gint" "rowstride")
+    '("const-GdkWChar*" "text")
+    '("gint" "text_length")
   )
 )
 
-(define-method draw_rgb_image
+(define-method draw_drawable
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_rgb_image")
+  (c-name "gdk_draw_drawable")
   (return-type "none")
   (parameters
     '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
+    '("GdkDrawable*" "src")
+    '("gint" "xsrc")
+    '("gint" "ysrc")
+    '("gint" "xdest")
+    '("gint" "ydest")
     '("gint" "width")
     '("gint" "height")
-    '("GdkRgbDither" "dith")
-    '("guchar*" "rgb_buf")
-    '("gint" "rowstride")
   )
 )
 
-(define-method draw_rgb_image_dithalign
+(define-method draw_image
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_rgb_image_dithalign")
+  (c-name "gdk_draw_image")
   (return-type "none")
   (parameters
     '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
+    '("GdkImage*" "image")
+    '("gint" "xsrc")
+    '("gint" "ysrc")
+    '("gint" "xdest")
+    '("gint" "ydest")
     '("gint" "width")
     '("gint" "height")
-    '("GdkRgbDither" "dith")
-    '("guchar*" "rgb_buf")
-    '("gint" "rowstride")
-    '("gint" "xdith")
-    '("gint" "ydith")
+  )
+)
+
+(define-method draw_points
+  (of-object "GdkDrawable")
+  (c-name "gdk_draw_points")
+  (return-type "none")
+  (parameters
+    '("GdkGC*" "gc")
+    '("GdkPoint*" "points")
+    '("gint" "npoints")
   )
 )
 
@@ -1082,81 +1310,125 @@
   )
 )
 
-(define-method draw_string
+(define-method draw_lines
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_string")
+  (c-name "gdk_draw_lines")
   (return-type "none")
-  (deprecated "use GdkDrawable::draw_layout()")
   (parameters
-    '("GdkFont*" "font")
     '("GdkGC*" "gc")
-    '("gint" "x")
-    '("gint" "y")
-    '("const-gchar*" "string")
+    '("GdkPoint*" "points")
+    '("gint" "npoints")
   )
 )
 
-(define-method draw_text
+(define-method draw_pixbuf
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_text")
+  (c-name "gdk_draw_pixbuf")
+  (return-type "none")
+  (parameters
+    '("GdkGC*" "gc" (null-ok))
+    '("GdkPixbuf*" "pixbuf" (null-ok))
+    '("gint" "src_x" (null-ok))
+    '("gint" "src_y" (null-ok))
+    '("gint" "dest_x" (null-ok))
+    '("gint" "dest_y" (null-ok))
+    '("gint" "width" (default "-1") (null-ok))
+    '("gint" "height" (default "-1") (null-ok))
+    '("GdkRgbDither" "dither" (default "GDK_RGB_DITHER_NORMAL") (null-ok))
+    '("gint" "x_dither" (null-ok))
+    '("gint" "y_dither" (null-ok))
+  )
+)
+
+(define-method draw_glyphs
+  (of-object "GdkDrawable")
+  (c-name "gdk_draw_glyphs")
   (return-type "none")
-  (deprecated "use GdkDrawable::draw_layout()")
   (parameters
-    '("GdkFont*" "font")
     '("GdkGC*" "gc")
+    '("PangoFont*" "font")
     '("gint" "x")
     '("gint" "y")
-    '("const-gchar*" "text")
-    '("gint" "text_length")
+    '("PangoGlyphString*" "glyphs")
   )
 )
 
-(define-method draw_text_wc
+(define-method draw_layout_line
   (of-object "GdkDrawable")
-  (c-name "gdk_draw_text_wc")
+  (c-name "gdk_draw_layout_line")
   (return-type "none")
-  (deprecated "use GdkDrawable::draw_layout()")
   (parameters
-    '("GdkFont*" "font")
     '("GdkGC*" "gc")
     '("gint" "x")
     '("gint" "y")
-    '("const-GdkWChar*" "text")
-    '("gint" "text_length")
+    '("PangoLayoutLine*" "line")
   )
 )
 
-(define-method get_clip_region
+(define-method draw_layout
   (of-object "GdkDrawable")
-  (c-name "gdk_drawable_get_clip_region")
-  (return-type "GdkRegion*")
+  (c-name "gdk_draw_layout")
+  (return-type "none")
+  (parameters
+    '("GdkGC*" "gc")
+    '("gint" "x")
+    '("gint" "y")
+    '("PangoLayout*" "layout")
+  )
 )
 
-(define-method get_colormap
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_get_colormap")
-  (return-type "GdkColormap*")
+(define-function gdk_draw_layout_line_with_colors
+  (c-name "gdk_draw_layout_line_with_colors")
+  (return-type "none")
+  (parameters
+    '("GdkDrawable*" "drawable")
+    '("GdkGC*" "gc")
+    '("gint" "x")
+    '("gint" "y")
+    '("PangoLayoutLine*" "line")
+    '("GdkColor*" "foreground")
+    '("GdkColor*" "background")
+  )
 )
 
-(define-method get_data
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_get_data")
-  (return-type "gpointer")
+(define-function gdk_draw_layout_with_colors
+  (c-name "gdk_draw_layout_with_colors")
+  (return-type "none")
+  (deprecated "use GdkDrawable::draw_layout() instead")
   (parameters
-    '("const-gchar*" "key")
+    '("GdkDrawable*" "drawable")
+    '("GdkGC*" "gc")
+    '("gint" "x")
+    '("gint" "y")
+    '("PangoLayout*" "layout")
+    '("GdkColor*" "foreground")
+    '("GdkColor*" "background")
   )
 )
 
-(define-method get_depth
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_get_depth")
-  (return-type "gint")
+(define-function draw_glyphs_transformed
+  (c-name "gdk_draw_glyphs_transformed")
+  (return-type "none")
+  (parameters
+    '("GdkDrawable*" "drawable")
+    '("GdkGC*" "gc")
+    '("PangoMatrix*" "matrix")
+    '("PangoFont*" "font")
+    '("gint" "x")
+    '("gint" "y")
+    '("PangoGlyphString*" "glyphs")
+  )
 )
 
-(define-method get_display
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_get_display")
-  (return-type "GdkDisplay*")
+(define-function draw_trapezoids
+  (c-name "gdk_draw_trapezoids")
+  (return-type "none")
+  (parameters
+    '("GdkDrawable*" "drawable")
+    '("GdkGC*" "gc")
+    '("GdkTrapezoid*" "trapezoids")
+    '("gint" "n_trapezoids")
+  )
 )
 
 (define-method get_image
@@ -1172,25 +1444,10 @@
   )
 )
 
-(define-method get_screen
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_get_screen")
-  (return-type "GdkScreen*")
-)
-
-(define-method get_size
+(define-method get_clip_region
   (of-object "GdkDrawable")
-  (c-name "gdk_drawable_get_size")
-  (return-type "none")
-  (parameters
-    '("gint*" "width")
-    '("gint*" "height")
-  )
-)
-
-(define-function gdk_drawable_get_type
-  (c-name "gdk_drawable_get_type")
-  (return-type "GType")
+  (c-name "gdk_drawable_get_clip_region")
+  (return-type "GdkRegion*")
 )
 
 (define-method get_visible_region
@@ -1199,61 +1456,49 @@
   (return-type "GdkRegion*")
 )
 
-(define-method get_visual
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_get_visual")
-  (return-type "GdkVisual*")
-)
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkevents.h
 
-(define-method ref
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_ref")
-  (return-type "GdkDrawable*")
+(define-function gdk_event_get_type
+  (c-name "gdk_event_get_type")
+  (return-type "GType")
 )
 
-(define-method set_colormap
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_set_colormap")
-  (return-type "none")
-  (parameters
-    '("GdkColormap*" "colormap")
-  )
+(define-function events_pending
+  (c-name "gdk_events_pending")
+  (return-type "gboolean")
 )
 
-(define-method set_data
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_set_data")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "key")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy_func")
-  )
+(define-function event_get
+  (c-name "gdk_event_get")
+  (return-type "GdkEvent*")
 )
 
-(define-method unref
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_unref")
-  (return-type "none")
+(define-function event_peek
+  (c-name "gdk_event_peek")
+  (return-type "GdkEvent*")
 )
 
-(define-method drop_finish
-  (of-object "GdkDragContext")
-  (c-name "gdk_drop_finish")
-  (return-type "none")
+(define-function event_get_graphics_expose
+  (c-name "gdk_event_get_graphics_expose")
+  (return-type "GdkEvent*")
   (parameters
-    '("gboolean" "success")
-    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
+    '("GdkWindow*" "window")
   )
 )
 
-(define-method drop_reply
-  (of-object "GdkDragContext")
-  (c-name "gdk_drop_reply")
+(define-method put
+  (of-object "GdkEvent")
+  (c-name "gdk_event_put")
   (return-type "none")
+)
+
+(define-function event_new
+  (is-constructor-of "GdkEvent")
+  (c-name "gdk_event_new")
+  (caller-owns-return #t)
+  (return-type "GdkEvent*")
   (parameters
-    '("gboolean" "ok")
-    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
+    '("GdkEventType" "type")
   )
 )
 
@@ -1269,18 +1514,18 @@
   (return-type "none")
 )
 
-(define-function event_get
-  (c-name "gdk_event_get")
-  (return-type "GdkEvent*")
+(define-method get_time
+  (of-object "GdkEvent")
+  (c-name "gdk_event_get_time")
+  (return-type "guint32")
 )
 
-(define-method get_axis
+(define-method get_state
   (of-object "GdkEvent")
-  (c-name "gdk_event_get_axis")
+  (c-name "gdk_event_get_state")
   (return-type "gboolean")
   (parameters
-    '("GdkAxisUse" "axis_use")
-    '("gdouble*" "value")
+    '("GdkModifierType*" "state")
   )
 )
 
@@ -1294,14 +1539,6 @@
   )
 )
 
-(define-function event_get_graphics_expose
-  (c-name "gdk_event_get_graphics_expose")
-  (return-type "GdkEvent*")
-  (parameters
-    '("GdkWindow*" "window")
-  )
-)
-
 (define-method get_root_coords
   (of-object "GdkEvent")
   (c-name "gdk_event_get_root_coords")
@@ -1312,32 +1549,16 @@
   )
 )
 
-(define-method get_screen
-  (of-object "GdkEvent")
-  (c-name "gdk_event_get_screen")
-  (return-type "GdkScreen*")
-)
-
-(define-method get_state
+(define-method get_axis
   (of-object "GdkEvent")
-  (c-name "gdk_event_get_state")
+  (c-name "gdk_event_get_axis")
   (return-type "gboolean")
   (parameters
-    '("GdkModifierType*" "state")
+    '("GdkAxisUse" "axis_use")
+    '("gdouble*" "value")
   )
 )
 
-(define-method get_time
-  (of-object "GdkEvent")
-  (c-name "gdk_event_get_time")
-  (return-type "guint32")
-)
-
-(define-function gdk_event_get_type
-  (c-name "gdk_event_get_type")
-  (return-type "GType")
-)
-
 (define-function gdk_event_handler_set
   (c-name "gdk_event_handler_set")
   (return-type "none")
@@ -1348,85 +1569,87 @@
   )
 )
 
-(define-function event_new
-  (is-constructor-of "GdkEvent")
-  (c-name "gdk_event_new")
-  (caller-owns-return #t)
-  (return-type "GdkEvent*")
+(define-method set_screen
+  (of-object "GdkEvent")
+  (c-name "gdk_event_set_screen")
+  (return-type "none")
   (parameters
-    '("GdkEventType" "type")
+    '("GdkScreen*" "screen")
   )
 )
 
-(define-function event_peek
-  (c-name "gdk_event_peek")
-  (return-type "GdkEvent*")
-)
-
-(define-method put
+(define-method get_screen
   (of-object "GdkEvent")
-  (c-name "gdk_event_put")
-  (return-type "none")
+  (c-name "gdk_event_get_screen")
+  (return-type "GdkScreen*")
 )
 
-(define-method set_screen
-  (of-object "GdkEvent")
-  (c-name "gdk_event_set_screen")
+(define-function set_show_events
+  (c-name "gdk_set_show_events")
   (return-type "none")
   (parameters
-    '("GdkScreen*" "screen")
+    '("gboolean" "show_events")
   )
 )
 
-(define-function events_pending
-  (c-name "gdk_events_pending")
+(define-function get_show_events
+  (c-name "gdk_get_show_events")
   (return-type "gboolean")
 )
 
-(define-function flush
-  (c-name "gdk_flush")
+(define-function gdk_add_client_message_filter
+  (c-name "gdk_add_client_message_filter")
   (return-type "none")
-)
-
-(define-function font_from_description
-  (c-name "gdk_font_from_description")
-  (return-type "GdkFont*")
   (parameters
-    '("PangoFontDescription*" "font_desc")
+    '("GdkAtom" "message_type")
+    '("GdkFilterFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function font_from_description_for_display
-  (c-name "gdk_font_from_description_for_display")
-  (return-type "GdkFont*")
+(define-function setting_get
+  (c-name "gdk_setting_get")
+  (return-type "gboolean")
   (parameters
-    '("GdkDisplay*" "display")
-    '("PangoFontDescription*" "font_desc")
+    '("const-gchar*" "name")
+    '("GValue*" "value")
   )
 )
 
-(define-method get_display
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkfont.h
+
+(define-function font_get_type
+  (c-name "gdk_font_get_type")
+  (return-type "GType")
+)
+
+(define-method ref
   (of-object "GdkFont")
-  (c-name "gdk_font_get_display")
-  (return-type "GdkDisplay*")
+  (c-name "gdk_font_ref")
+  (return-type "GdkFont*")
 )
 
-(define-method id
+(define-method unref
   (of-object "GdkFont")
-  (c-name "gdk_font_id")
-  (return-type "gint")
+  (c-name "gdk_font_unref")
+  (return-type "none")
 )
 
-(define-function font_load
-  (is-constructor-of "GdkFont")
-  (c-name "gdk_font_load")
-  (caller-owns-return #t)
-  (return-type "GdkFont*")
+(define-method equal
+  (of-object "GdkFont")
+  (c-name "gdk_font_equal")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "font_name")
+    '("const-GdkFont*" "fontb")
   )
 )
 
+(define-method id
+  (of-object "GdkFont")
+  (c-name "gdk_font_id")
+  (return-type "gint")
+)
+
 (define-function font_load_for_display
   (c-name "gdk_font_load_for_display")
   (return-type "GdkFont*")
@@ -1436,1510 +1659,1473 @@
   )
 )
 
-(define-function fontset_load
-  (c-name "gdk_fontset_load")
+(define-function fontset_load_for_display
+  (c-name "gdk_fontset_load_for_display")
   (return-type "GdkFont*")
   (parameters
+    '("GdkDisplay*" "display")
     '("const-gchar*" "fontset_name")
   )
 )
 
-(define-function fontset_load_for_display
-  (c-name "gdk_fontset_load_for_display")
+(define-function font_from_description_for_display
+  (c-name "gdk_font_from_description_for_display")
   (return-type "GdkFont*")
   (parameters
     '("GdkDisplay*" "display")
-    '("const-gchar*" "fontset_name")
+    '("PangoFontDescription*" "font_desc")
   )
 )
 
-(define-method copy
-  (of-object "GdkGC")
-  (c-name "gdk_gc_copy")
-  (return-type "none")
+(define-function font_load
+  (is-constructor-of "GdkFont")
+  (c-name "gdk_font_load")
+  (caller-owns-return #t)
+  (return-type "GdkFont*")
   (parameters
-    '("GdkGC*" "src_gc")
+    '("const-gchar*" "font_name")
   )
 )
 
-(define-method get_colormap
-  (of-object "GdkGC")
-  (c-name "gdk_gc_get_colormap")
-  (return-type "GdkColormap*")
-)
-
-(define-method get_screen
-  (of-object "GdkGC")
-  (c-name "gdk_gc_get_screen")
-  (return-type "GdkScreen*")
-)
-
-(define-function gdk_gc_get_type
-  (c-name "gdk_gc_get_type")
-  (return-type "GType")
-)
-
-(define-method get_values
-  (of-object "GdkGC")
-  (c-name "gdk_gc_get_values")
-  (return-type "none")
+(define-function fontset_load
+  (c-name "gdk_fontset_load")
+  (return-type "GdkFont*")
   (parameters
-    '("GdkGCValues*" "values")
+    '("const-gchar*" "fontset_name")
   )
 )
 
-(define-function gc_new
-  (is-constructor-of "GdkGC")
-  (c-name "gdk_gc_new")
-  (caller-owns-return #t)
-  (return-type "GdkGC*")
+(define-function font_from_description
+  (c-name "gdk_font_from_description")
+  (return-type "GdkFont*")
   (parameters
-    '("GdkDrawable*" "drawable")
+    '("PangoFontDescription*" "font_desc")
   )
 )
 
-(define-function gc_new
-  (c-name "gdk_gc_new2")
-  (return-type "GdkGC*")
-  (deprecated "use GdkGC() constructor instead")
+(define-method string_width
+  (of-object "GdkFont")
+  (c-name "gdk_string_width")
+  (return-type "gint")
   (parameters
-    '("GdkDrawable*" "drawable")
+    '("const-gchar*" "string")
   )
 )
 
-(define-method new_gc
-  (of-object "GdkDrawable")
-  (c-name "gdk_gc_new_with_values")
-  (return-type "GdkGC*")
+(define-method width
+  (of-object "GdkFont")
+  (c-name "gdk_text_width")
+  (return-type "gint")
   (parameters
-    '("GdkGCValues*" "values")
-    '("GdkGCValuesMask" "values_mask")
+    '("const-gchar*" "text")
+    '("gint" "text_length" (default "-1"))
   )
 )
 
-(define-method offset
-  (of-object "GdkGC")
-  (c-name "gdk_gc_offset")
-  (return-type "none")
+(define-method text_width_wc
+  (of-object "GdkFont")
+  (c-name "gdk_text_width_wc")
+  (return-type "gint")
   (parameters
-    '("gint" "x_offset")
-    '("gint" "y_offset")
+    '("const-GdkWChar*" "text")
+    '("gint" "text_length")
   )
 )
 
-(define-method set_background
-  (of-object "GdkGC")
-  (c-name "gdk_gc_set_background")
-  (return-type "none")
+(define-method char_width
+  (of-object "GdkFont")
+  (c-name "gdk_char_width")
+  (return-type "gint")
   (parameters
-    '("GdkColor*" "color")
+    '("gchar" "character")
   )
 )
 
-(define-method set_clip_mask
-  (of-object "GdkGC")
-  (c-name "gdk_gc_set_clip_mask")
-  (return-type "none")
+(define-method char_width_wc
+  (of-object "GdkFont")
+  (c-name "gdk_char_width_wc")
+  (return-type "gint")
   (parameters
-    '("GdkBitmap*" "mask")
+    '("GdkWChar" "character")
   )
 )
 
-(define-method set_clip_origin
-  (of-object "GdkGC")
-  (c-name "gdk_gc_set_clip_origin")
-  (return-type "none")
+(define-method string_measure
+  (of-object "GdkFont")
+  (c-name "gdk_string_measure")
+  (return-type "gint")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("const-gchar*" "string")
   )
 )
 
-(define-method set_clip_rectangle
-  (of-object "GdkGC")
-  (c-name "gdk_gc_set_clip_rectangle")
-  (return-type "none")
+(define-method measure
+  (of-object "GdkFont")
+  (c-name "gdk_text_measure")
+  (return-type "gint")
   (parameters
-    '("GdkRectangle*" "rectangle")
+    '("const-gchar*" "text")
+    '("gint" "text_length" (default "-1"))
   )
 )
 
-(define-method set_clip_region
-  (of-object "GdkGC")
-  (c-name "gdk_gc_set_clip_region")
-  (return-type "none")
+(define-method char_measure
+  (of-object "GdkFont")
+  (c-name "gdk_char_measure")
+  (return-type "gint")
   (parameters
-    '("GdkRegion*" "region")
+    '("gchar" "character")
   )
 )
 
-(define-method set_colormap
-  (of-object "GdkGC")
-  (c-name "gdk_gc_set_colormap")
-  (return-type "none")
+(define-method string_height
+  (of-object "GdkFont")
+  (c-name "gdk_string_height")
+  (return-type "gint")
   (parameters
-    '("GdkColormap*" "colormap")
+    '("const-gchar*" "string")
   )
 )
 
-(define-method set_dashes
-  (of-object "GdkGC")
-  (c-name "gdk_gc_set_dashes")
-  (return-type "none")
+(define-method height
+  (of-object "GdkFont")
+  (c-name "gdk_text_height")
+  (return-type "gint")
   (parameters
-    '("gint" "dash_offset")
-    '("gint8[]" "dash_list")
-    '("gint" "n")
+    '("const-gchar*" "text")
+    '("gint" "text_length" (default "-1"))
   )
 )
 
-(define-method set_exposures
-  (of-object "GdkGC")
-  (c-name "gdk_gc_set_exposures")
-  (return-type "none")
+(define-method char_height
+  (of-object "GdkFont")
+  (c-name "gdk_char_height")
+  (return-type "gint")
   (parameters
-    '("gboolean" "exposures")
+    '("gchar" "character")
   )
 )
 
-(define-method set_fill
-  (of-object "GdkGC")
-  (c-name "gdk_gc_set_fill")
+(define-method extents
+  (of-object "GdkFont")
+  (c-name "gdk_text_extents")
   (return-type "none")
   (parameters
-    '("GdkFill" "fill")
+    '("const-gchar*" "text")
+    '("gint" "text_length")
+    '("gint*" "lbearing")
+    '("gint*" "rbearing")
+    '("gint*" "width")
+    '("gint*" "ascent")
+    '("gint*" "descent")
   )
 )
 
-(define-method set_font
-  (of-object "GdkGC")
-  (c-name "gdk_gc_set_font")
+(define-method text_extents_wc
+  (of-object "GdkFont")
+  (c-name "gdk_text_extents_wc")
   (return-type "none")
   (parameters
-    '("GdkFont*" "font")
+    '("const-GdkWChar*" "text")
+    '("gint" "text_length")
+    '("gint*" "lbearing")
+    '("gint*" "rbearing")
+    '("gint*" "width")
+    '("gint*" "ascent")
+    '("gint*" "descent")
   )
 )
 
-(define-method set_foreground
-  (of-object "GdkGC")
-  (c-name "gdk_gc_set_foreground")
+(define-method string_extents
+  (of-object "GdkFont")
+  (c-name "gdk_string_extents")
   (return-type "none")
   (parameters
-    '("GdkColor*" "color")
+    '("const-gchar*" "string")
+    '("gint*" "lbearing")
+    '("gint*" "rbearing")
+    '("gint*" "width")
+    '("gint*" "ascent")
+    '("gint*" "descent")
   )
 )
 
-(define-method set_function
+(define-method get_display
+  (of-object "GdkFont")
+  (c-name "gdk_font_get_display")
+  (return-type "GdkDisplay*")
+)
+
+
+
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkgc.h
+
+(define-method ref
   (of-object "GdkGC")
-  (c-name "gdk_gc_set_function")
-  (return-type "none")
-  (parameters
-    '("GdkFunction" "function")
-  )
+  (c-name "gdk_gc_ref")
+  (return-type "GdkGC*")
 )
 
-(define-method set_line_attributes
+(define-method unref
   (of-object "GdkGC")
-  (c-name "gdk_gc_set_line_attributes")
+  (c-name "gdk_gc_unref")
   (return-type "none")
-  (parameters
-    '("gint" "line_width")
-    '("GdkLineStyle" "line_style")
-    '("GdkCapStyle" "cap_style")
-    '("GdkJoinStyle" "join_style")
-  )
 )
 
-(define-method set_rgb_bg_color
+(define-function gdk_gc_get_type
+  (c-name "gdk_gc_get_type")
+  (return-type "GType")
+)
+
+(define-function gc_new
+  (is-constructor-of "GdkGC")
+  (c-name "gdk_gc_new")
+  (caller-owns-return #t)
+  (return-type "GdkGC*")
+  (parameters
+    '("GdkDrawable*" "drawable")
+  )
+)
+
+(define-method new_gc
+  (of-object "GdkDrawable")
+  (c-name "gdk_gc_new_with_values")
+  (return-type "GdkGC*")
+  (parameters
+    '("GdkGCValues*" "values")
+    '("GdkGCValuesMask" "values_mask")
+  )
+)
+
+(define-method get_values
   (of-object "GdkGC")
-  (c-name "gdk_gc_set_rgb_bg_color")
+  (c-name "gdk_gc_get_values")
   (return-type "none")
   (parameters
-    '("GdkColor*" "color")
+    '("GdkGCValues*" "values")
   )
 )
 
-(define-method set_rgb_fg_color
+(define-method set_values
   (of-object "GdkGC")
-  (c-name "gdk_gc_set_rgb_fg_color")
+  (c-name "gdk_gc_set_values")
   (return-type "none")
   (parameters
-    '("GdkColor*" "color")
+    '("GdkGCValues*" "values")
+    '("GdkGCValuesMask" "values_mask")
   )
 )
 
-(define-method set_stipple
+(define-method set_foreground
   (of-object "GdkGC")
-  (c-name "gdk_gc_set_stipple")
+  (c-name "gdk_gc_set_foreground")
   (return-type "none")
   (parameters
-    '("GdkPixmap*" "stipple")
+    '("GdkColor*" "color")
   )
 )
 
-(define-method set_subwindow
+(define-method set_background
   (of-object "GdkGC")
-  (c-name "gdk_gc_set_subwindow")
+  (c-name "gdk_gc_set_background")
   (return-type "none")
   (parameters
-    '("GdkSubwindowMode" "mode")
+    '("GdkColor*" "color")
   )
 )
 
-(define-method set_tile
+(define-method set_font
   (of-object "GdkGC")
-  (c-name "gdk_gc_set_tile")
+  (c-name "gdk_gc_set_font")
   (return-type "none")
   (parameters
-    '("GdkPixmap*" "tile")
+    '("GdkFont*" "font")
   )
 )
 
-(define-method set_ts_origin
+(define-method set_function
   (of-object "GdkGC")
-  (c-name "gdk_gc_set_ts_origin")
+  (c-name "gdk_gc_set_function")
   (return-type "none")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
+    '("GdkFunction" "function")
   )
 )
 
-(define-method set_values
+(define-method set_fill
   (of-object "GdkGC")
-  (c-name "gdk_gc_set_values")
+  (c-name "gdk_gc_set_fill")
   (return-type "none")
   (parameters
-    '("GdkGCValues*" "values")
-    '("GdkGCValuesMask" "values_mask")
+    '("GdkFill" "fill")
   )
 )
 
-(define-function get_default_root_window
-  (c-name "gdk_get_default_root_window")
-  (return-type "GdkWindow*")
+(define-method set_tile
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_tile")
+  (return-type "none")
+  (parameters
+    '("GdkPixmap*" "tile")
+  )
 )
 
-(define-function get_show_events
-  (c-name "gdk_get_show_events")
-  (return-type "gboolean")
+(define-method set_stipple
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_stipple")
+  (return-type "none")
+  (parameters
+    '("GdkPixmap*" "stipple")
+  )
 )
 
-(define-method image_get
-  (of-object "GdkDrawable")
-  (c-name "gdk_image_get")
-  (return-type "GdkImage*")
-  (deprecated "use GdkDrawable::get_image()")
+(define-method set_ts_origin
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_ts_origin")
+  (return-type "none")
   (parameters
     '("gint" "x")
     '("gint" "y")
-    '("gint" "width")
-    '("gint" "height")
   )
 )
 
-(define-method get_colormap
-  (of-object "GdkImage")
-  (c-name "gdk_image_get_colormap")
-  (return-type "GdkColormap*")
-)
-
-(define-method get_pixel
-  (of-object "GdkImage")
-  (c-name "gdk_image_get_pixel")
-  (return-type "guint32")
+(define-method set_clip_origin
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_clip_origin")
+  (return-type "none")
   (parameters
     '("gint" "x")
     '("gint" "y")
   )
 )
 
-(define-function gdk_image_get_type
-  (c-name "gdk_image_get_type")
-  (return-type "GType")
-)
-
-(define-function gdk_image_new
-  (is-constructor-of "GdkImage")
-  (c-name "gdk_image_new")
-  (caller-owns-return #t)
-  (return-type "GdkImage*")
+(define-method set_clip_mask
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_clip_mask")
+  (return-type "none")
   (parameters
-    '("GdkImageType" "type")
-    '("GdkVisual*" "visual")
-    '("gint" "width")
-    '("gint" "height")
+    '("GdkBitmap*" "mask")
   )
 )
 
-(define-method put_pixel
-  (of-object "GdkImage")
-  (c-name "gdk_image_put_pixel")
+(define-method set_clip_rectangle
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_clip_rectangle")
   (return-type "none")
   (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("guint32" "pixel")
+    '("GdkRectangle*" "rectangle")
   )
 )
 
-(define-method set_colormap
-  (of-object "GdkImage")
-  (c-name "gdk_image_set_colormap")
+(define-method set_clip_region
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_clip_region")
   (return-type "none")
   (parameters
-    '("GdkColormap*" "colormap")
+    '("GdkRegion*" "region")
   )
 )
 
-(define-method input_set_extension_events
-  (of-object "GdkWindow")
-  (c-name "gdk_input_set_extension_events")
+(define-method set_subwindow
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_subwindow")
   (return-type "none")
   (parameters
-    '("gint" "mask")
-    '("GdkExtensionMode" "mode")
+    '("GdkSubwindowMode" "mode")
   )
 )
 
-(define-function keyboard_grab
-  (c-name "gdk_keyboard_grab")
-  (return-type "GdkGrabStatus")
+(define-method set_exposures
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_exposures")
+  (return-type "none")
   (parameters
-    '("GdkWindow*" "window")
-    '("gboolean" "owner_events" (default "FALSE") (null-ok))
-    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
+    '("gboolean" "exposures")
   )
 )
 
-(define-function keyboard_ungrab
-  (c-name "gdk_keyboard_ungrab")
+(define-method set_line_attributes
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_line_attributes")
   (return-type "none")
   (parameters
-    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
+    '("gint" "line_width")
+    '("GdkLineStyle" "line_style")
+    '("GdkCapStyle" "cap_style")
+    '("GdkJoinStyle" "join_style")
   )
 )
 
-(define-method get_default
-  (of-object "GdkKeymap")
-  (c-name "gdk_keymap_get_default")
-  (return-type "GdkKeymap*")
-  (static #t)
-)
-
-(define-method get_direction
-  (of-object "GdkKeymap")
-  (c-name "gdk_keymap_get_direction")
-  (return-type "PangoDirection")
+(define-method set_dashes
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_dashes")
+  (return-type "none")
+  (parameters
+    '("gint" "dash_offset")
+    '("gint8[]" "dash_list")
+    '("gint" "n")
+  )
 )
 
-(define-method get_entries_for_keycode
-  (of-object "GdkKeymap")
-  (c-name "gdk_keymap_get_entries_for_keycode")
-  (return-type "gboolean")
+(define-method offset
+  (of-object "GdkGC")
+  (c-name "gdk_gc_offset")
+  (return-type "none")
   (parameters
-    '("guint" "hardware_keycode")
-    '("GdkKeymapKey**" "keys")
-    '("guint**" "keyvals")
-    '("gint*" "n_entries")
+    '("gint" "x_offset")
+    '("gint" "y_offset")
   )
 )
 
-(define-method get_entries_for_keyval
-  (of-object "GdkKeymap")
-  (c-name "gdk_keymap_get_entries_for_keyval")
-  (return-type "gboolean")
+(define-method copy
+  (of-object "GdkGC")
+  (c-name "gdk_gc_copy")
+  (return-type "none")
   (parameters
-    '("guint" "keyval")
-    '("GdkKeymapKey**" "keys")
-    '("gint*" "n_keys")
+    '("GdkGC*" "src_gc")
   )
 )
 
-(define-method get_for_display
-  (of-object "GdkKeymap")
-  (c-name "gdk_keymap_get_for_display")
-  (return-type "GdkKeymap*")
-  (static #t)
+(define-method set_colormap
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_colormap")
+  (return-type "none")
   (parameters
-    '("GdkDisplay*" "display")
+    '("GdkColormap*" "colormap")
   )
 )
 
-(define-function gdk_keymap_get_type
-  (c-name "gdk_keymap_get_type")
-  (return-type "GType")
+(define-method get_colormap
+  (of-object "GdkGC")
+  (c-name "gdk_gc_get_colormap")
+  (return-type "GdkColormap*")
 )
 
-(define-method lookup_key
-  (of-object "GdkKeymap")
-  (c-name "gdk_keymap_lookup_key")
-  (return-type "guint")
+(define-method set_rgb_fg_color
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_rgb_fg_color")
+  (return-type "none")
   (parameters
-    '("const-GdkKeymapKey*" "key")
+    '("GdkColor*" "color")
   )
 )
 
-(define-method translate_keyboard_state
-  (of-object "GdkKeymap")
-  (c-name "gdk_keymap_translate_keyboard_state")
-  (return-type "gboolean")
+(define-method set_rgb_bg_color
+  (of-object "GdkGC")
+  (c-name "gdk_gc_set_rgb_bg_color")
+  (return-type "none")
   (parameters
-    '("guint" "hardware_keycode")
-    '("GdkModifierType" "state")
-    '("gint" "group")
-    '("guint*" "keyval")
-    '("gint*" "effective_group")
-    '("gint*" "level")
-    '("GdkModifierType*" "consumed_modifiers")
+    '("GdkColor*" "color")
   )
 )
 
-(define-function keyval_convert_case
-  (c-name "gdk_keyval_convert_case")
-  (return-type "none")
-  (parameters
-    '("guint" "symbol")
-    '("guint*" "lower")
-    '("guint*" "upper")
-  )
+(define-method get_screen
+  (of-object "GdkGC")
+  (c-name "gdk_gc_get_screen")
+  (return-type "GdkScreen*")
 )
 
-(define-function keyval_from_name
-  (c-name "gdk_keyval_from_name")
-  (return-type "guint")
-  (parameters
-    '("const-gchar*" "keyval_name")
-  )
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkimage.h
+
+(define-function gdk_image_get_type
+  (c-name "gdk_image_get_type")
+  (return-type "GType")
 )
 
-(define-function keyval_is_lower
-  (c-name "gdk_keyval_is_lower")
-  (return-type "gboolean")
+(define-function gdk_image_new
+  (is-constructor-of "GdkImage")
+  (c-name "gdk_image_new")
+  (caller-owns-return #t)
+  (return-type "GdkImage*")
   (parameters
-    '("guint" "keyval")
+    '("GdkImageType" "type")
+    '("GdkVisual*" "visual")
+    '("gint" "width")
+    '("gint" "height")
   )
 )
 
-(define-function keyval_is_upper
-  (c-name "gdk_keyval_is_upper")
-  (return-type "gboolean")
+(define-method ref
+  (of-object "GdkImage")
+  (c-name "gdk_image_ref")
+  (return-type "GdkImage*")
+)
+
+(define-method unref
+  (of-object "GdkImage")
+  (c-name "gdk_image_unref")
+  (return-type "none")
+)
+
+(define-function image_new_bitmap
+  (c-name "gdk_image_new_bitmap")
+  (return-type "GdkImage*")
   (parameters
-    '("guint" "keyval")
+    '("GdkVisual*" "visual")
+    '("gpointer" "data")
+    '("gint" "width")
+    '("gint" "height")
   )
 )
 
-(define-function keyval_name
-  (c-name "gdk_keyval_name")
-  (return-type "gchar*")
+(define-method image_get
+  (of-object "GdkDrawable")
+  (c-name "gdk_image_get")
+  (return-type "GdkImage*")
+  (deprecated "use GdkDrawable::get_image()")
   (parameters
-    '("guint" "keyval")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
   )
 )
 
-(define-function keyval_to_lower
-  (c-name "gdk_keyval_to_lower")
-  (return-type "guint")
+(define-method put_pixel
+  (of-object "GdkImage")
+  (c-name "gdk_image_put_pixel")
+  (return-type "none")
   (parameters
-    '("guint" "keyval")
+    '("gint" "x")
+    '("gint" "y")
+    '("guint32" "pixel")
   )
 )
 
-(define-function keyval_to_unicode
-  (c-name "gdk_keyval_to_unicode")
+(define-method get_pixel
+  (of-object "GdkImage")
+  (c-name "gdk_image_get_pixel")
   (return-type "guint32")
   (parameters
-    '("guint" "keyval")
+    '("gint" "x")
+    '("gint" "y")
   )
 )
 
-(define-function keyval_to_upper
-  (c-name "gdk_keyval_to_upper")
-  (return-type "guint")
+(define-method set_colormap
+  (of-object "GdkImage")
+  (c-name "gdk_image_set_colormap")
+  (return-type "none")
   (parameters
-    '("guint" "keyval")
+    '("GdkColormap*" "colormap")
   )
 )
 
-(define-method list_visuals
-  (of-object "GdkVisual")
-  (c-name "gdk_list_visuals")
+(define-method get_colormap
+  (of-object "GdkImage")
+  (c-name "gdk_image_get_colormap")
+  (return-type "GdkColormap*")
+)
+
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkinput.h
+
+(define-function device_get_type
+  (c-name "gdk_device_get_type")
+  (return-type "GType")
+)
+
+(define-method list_devices
+  (of-object "GdkDevice")
+  (c-name "gdk_devices_list")
   (return-type "GList*")
   (static #t)
 )
 
-(define-method add_alpha
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_add_alpha")
-  (caller-owns-return #t)
-  (return-type "GdkPixbuf*")
+(define-method set_source
+  (of-object "GdkDevice")
+  (c-name "gdk_device_set_source")
+  (return-type "none")
   (parameters
-    '("gboolean" "substitute_color")
-    '("guchar" "r")
-    '("guchar" "g")
-    '("guchar" "b")
+    '("GdkInputSource" "source")
   )
 )
 
-(define-method get_height
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_get_height")
-  (return-type "int")
+(define-method set_mode
+  (of-object "GdkDevice")
+  (c-name "gdk_device_set_mode")
+  (return-type "gboolean")
+  (parameters
+    '("GdkInputMode" "mode")
+  )
 )
 
-(define-method get_iter
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_get_iter")
-  (return-type "GdkPixbufAnimationIter*")
+(define-method set_key
+  (of-object "GdkDevice")
+  (c-name "gdk_device_set_key")
+  (return-type "none")
   (parameters
-    '("const-GTimeVal*" "start_time")
+    '("guint" "index")
+    '("guint" "keyval")
+    '("GdkModifierType" "modifiers")
   )
 )
 
-(define-method get_static_image
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_get_static_image")
-  (return-type "GdkPixbuf*")
+(define-method set_axis_use
+  (of-object "GdkDevice")
+  (c-name "gdk_device_set_axis_use")
+  (return-type "none")
+  (parameters
+    '("guint" "index")
+    '("GdkAxisUse" "use")
+  )
 )
 
-(define-function gdk_pixbuf_animation_get_type
-  (c-name "gdk_pixbuf_animation_get_type")
-  (return-type "GType")
+(define-method get_state
+  (of-object "GdkDevice")
+  (c-name "gdk_device_get_state")
+  (return-type "none")
+  (parameters
+    '("GdkWindow*" "window")
+    '("gdouble*" "axes")
+    '("GdkModifierType*" "mask")
+  )
 )
 
-(define-method get_width
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_get_width")
-  (return-type "int")
+(define-method get_history
+  (of-object "GdkDevice")
+  (c-name "gdk_device_get_history")
+  (return-type "gboolean")
+  (parameters
+    '("GdkWindow*" "window")
+    '("guint32" "start")
+    '("guint32" "stop")
+    '("GdkTimeCoord***" "events")
+    '("gint*" "n_events")
+  )
 )
 
-(define-method is_static_image
-  (of-object "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_is_static_image")
-  (return-type "gboolean")
+(define-function device_free_history
+  (c-name "gdk_device_free_history")
+  (return-type "none")
+  (parameters
+    '("GdkTimeCoord**" "events")
+    '("gint" "n_events")
+  )
 )
 
-(define-method advance
-  (of-object "GdkPixbufAnimationIter")
-  (c-name "gdk_pixbuf_animation_iter_advance")
+(define-method get_axis
+  (of-object "GdkDevice")
+  (c-name "gdk_device_get_axis")
   (return-type "gboolean")
   (parameters
-    '("const-GTimeVal*" "current_time")
+    '("gdouble*" "axes")
+    '("GdkAxisUse" "use")
+    '("gdouble*" "value")
   )
 )
 
-(define-method get_delay_time
-  (of-object "GdkPixbufAnimationIter")
-  (c-name "gdk_pixbuf_animation_iter_get_delay_time")
-  (return-type "int")
+(define-method input_set_extension_events
+  (of-object "GdkWindow")
+  (c-name "gdk_input_set_extension_events")
+  (return-type "none")
+  (parameters
+    '("gint" "mask")
+    '("GdkExtensionMode" "mode")
+  )
 )
 
-(define-method get_pixbuf
-  (of-object "GdkPixbufAnimationIter")
-  (c-name "gdk_pixbuf_animation_iter_get_pixbuf")
-  (return-type "GdkPixbuf*")
+(define-method get_core_pointer
+  (of-object "GdkDevice")
+  (c-name "gdk_device_get_core_pointer")
+  (return-type "GdkDevice*")
+  (static #t)
 )
 
-(define-function pixbuf_animation_iter_get_type
-  (c-name "gdk_pixbuf_animation_iter_get_type")
+;; from /opt/gtk2/include/gtk-2.0/gdk/gdkkeys.h
+
+(define-function gdk_keymap_get_type
+  (c-name "gdk_keymap_get_type")
   (return-type "GType")
 )
 
-(define-method on_currently_loading_frame
-  (of-object "GdkPixbufAnimationIter")
-  (c-name "gdk_pixbuf_animation_iter_on_currently_loading_frame")
-  (return-type "gboolean")
-)
+(define-method get_default
+  (of-object "GdkKeymap")
+  (c-name "gdk_keymap_get_default")
+  (return-type "GdkKeymap*")
+  (static #t)
+)
 
-(define-function gdk_pixbuf_animation_new_from_file
-  (is-constructor-of "GdkPixbufAnimation")
-  (c-name "gdk_pixbuf_animation_new_from_file")
-  (caller-owns-return #t)
-  (return-type "GdkPixbufAnimation*")
+(define-method get_for_display
+  (of-object "GdkKeymap")
+  (c-name "gdk_keymap_get_for_display")
+  (return-type "GdkKeymap*")
+  (static #t)
   (parameters
-    '("const-char*" "filename")
-    '("GError**" "error")
+    '("GdkDisplay*" "display")
   )
 )
 
-(define-method composite
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_composite")
-  (return-type "none")
+(define-method lookup_key
+  (of-object "GdkKeymap")
+  (c-name "gdk_keymap_lookup_key")
+  (return-type "guint")
   (parameters
-    '("GdkPixbuf*" "dest")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("double" "offset_x")
-    '("double" "offset_y")
-    '("double" "scale_x")
-    '("double" "scale_y")
-    '("GdkInterpType" "interp_type")
-    '("int" "overall_alpha")
+    '("const-GdkKeymapKey*" "key")
   )
 )
 
-(define-method composite_color
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_composite_color")
-  (return-type "none")
+(define-method translate_keyboard_state
+  (of-object "GdkKeymap")
+  (c-name "gdk_keymap_translate_keyboard_state")
+  (return-type "gboolean")
   (parameters
-    '("GdkPixbuf*" "dest")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("double" "offset_x")
-    '("double" "offset_y")
-    '("double" "scale_x")
-    '("double" "scale_y")
-    '("GdkInterpType" "interp_type")
-    '("int" "overall_alpha")
-    '("int" "check_x")
-    '("int" "check_y")
-    '("int" "check_size")
-    '("guint32" "color1")
-    '("guint32" "color2")
+    '("guint" "hardware_keycode")
+    '("GdkModifierType" "state")
+    '("gint" "group")
+    '("guint*" "keyval")
+    '("gint*" "effective_group")
+    '("gint*" "level")
+    '("GdkModifierType*" "consumed_modifiers")
   )
 )
 
-(define-method composite_color_simple
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_composite_color_simple")
-  (caller-owns-return #t)
-  (return-type "GdkPixbuf*")
+(define-method get_entries_for_keyval
+  (of-object "GdkKeymap")
+  (c-name "gdk_keymap_get_entries_for_keyval")
+  (return-type "gboolean")
   (parameters
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("GdkInterpType" "interp_type")
-    '("int" "overall_alpha")
-    '("int" "check_size")
-    '("guint32" "color1")
-    '("guint32" "color2")
+    '("guint" "keyval")
+    '("GdkKeymapKey**" "keys")
+    '("gint*" "n_keys")
   )
 )
 
-(define-method copy
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_copy")
-  (caller-owns-return #t)
-  (return-type "GdkPixbuf*")
+(define-method get_entries_for_keycode
+  (of-object "GdkKeymap")
+  (c-name "gdk_keymap_get_entries_for_keycode")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "hardware_keycode")
+    '("GdkKeymapKey**" "keys")
+    '("guint**" "keyvals")
+    '("gint*" "n_entries")
+  )
 )
 
-(define-method copy_area
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_copy_area")
-  (return-type "none")
+(define-method get_direction
+  (of-object "GdkKeymap")
+  (c-name "gdk_keymap_get_direction")
+  (return-type "PangoDirection")
+)
+
+(define-function keyval_name
+  (c-name "gdk_keyval_name")
+  (return-type "gchar*")
   (parameters
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "width")
-    '("int" "height")
-    '("GdkPixbuf*" "dest_pixbuf")
-    '("int" "dest_x")
-    '("int" "dest_y")
+    '("guint" "keyval")
   )
 )
 
-(define-method fill
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_fill")
+(define-function keyval_from_name
+  (c-name "gdk_keyval_from_name")
+  (return-type "guint")
   (parameters
-    '("guint32" "pixel")
+    '("const-gchar*" "keyval_name")
   )
 )
 
-(define-method get_description
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_description")
-  (caller-owns-return #t)
-  (return-type "gchar*")
+(define-function keyval_convert_case
+  (c-name "gdk_keyval_convert_case")
+  (return-type "none")
+  (parameters
+    '("guint" "symbol")
+    '("guint*" "lower")
+    '("guint*" "upper")
+  )
 )
 
-(define-method get_extensions
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_extensions")
-  (return-type "gchar**")
+(define-function keyval_to_upper
+  (c-name "gdk_keyval_to_upper")
+  (return-type "guint")
+  (parameters
+    '("guint" "keyval")
+  )
 )
 
-(define-method get_mime_types
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_mime_types")
-  (return-type "gchar**")
+(define-function keyval_to_lower
+  (c-name "gdk_keyval_to_lower")
+  (return-type "guint")
+  (parameters
+    '("guint" "keyval")
+  )
 )
 
-(define-method get_name
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_get_name")
-  (caller-owns-return #t)
-  (return-type "gchar*")
+(define-function keyval_is_upper
+  (c-name "gdk_keyval_is_upper")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "keyval")
+  )
 )
 
-(define-method is_writable
-  (of-object "GdkPixbufFormat")
-  (c-name "gdk_pixbuf_format_is_writable")
+(define-function keyval_is_lower
+  (c-name "gdk_keyval_is_lower")
   (return-type "gboolean")
+  (parameters
+    '("guint" "keyval")
+  )
 )
 
-(define-method get_bits_per_sample
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_bits_per_sample")
-  (return-type "int")
+(define-function keyval_to_unicode
+  (c-name "gdk_keyval_to_unicode")
+  (return-type "guint32")
+  (parameters
+    '("guint" "keyval")
+  )
 )
 
-(define-method get_colorspace
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_colorspace")
-  (return-type "GdkColorspace")
+(define-function unicode_to_keyval
+  (c-name "gdk_unicode_to_keyval")
+  (return-type "guint")
+  (parameters
+    '("guint32" "wc")
+  )
 )
 
-(define-method get_file_info
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkpixbuf.h
+
+(define-method render_threshold_alpha
   (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_file_info")
-  (return-type "GdkPixbufFormat*")
+  (c-name "gdk_pixbuf_render_threshold_alpha")
+  (return-type "none")
   (parameters
-    '("gint*" "width")
-    '("gint*" "height")
+    '("GdkBitmap*" "bitmap")
+    '("int" "src_x")
+    '("int" "src_y")
+    '("int" "dest_x")
+    '("int" "dest_y")
+    '("int" "width")
+    '("int" "height")
+    '("int" "alpha_threshold")
   )
-  (static #t)
 )
 
-(define-method get_formats
+(define-method render_pixmap_and_mask_for_colormap
   (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_formats")
-  (return-type "GSList*")
-  (static #t)
+  (c-name "gdk_pixbuf_render_pixmap_and_mask_for_colormap")
+  (return-type "none")
+  (parameters
+    '("GdkColormap*" "colormap")
+    '("GdkPixmap**" "pixmap_return")
+    '("GdkBitmap**" "mask_return")
+    '("int" "alpha_threshold")
+  )
 )
 
-(define-method get_from_drawable
+(define-method render_to_drawable
   (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_from_drawable")
-  (return-type "GdkPixbuf*")
+  (c-name "gdk_pixbuf_render_to_drawable")
+  (return-type "none")
+  (deprecated "use GdkDrawable::draw_pixbuf() instead")
   (parameters
-    '("GdkDrawable*" "src")
-    '("GdkColormap*" "cmap")
+    '("GdkDrawable*" "drawable")
+    '("GdkGC*" "gc")
     '("int" "src_x")
     '("int" "src_y")
     '("int" "dest_x")
     '("int" "dest_y")
     '("int" "width")
     '("int" "height")
+    '("GdkRgbDither" "dither" (default "GDK_RGB_DITHER_NORMAL"))
+    '("gint" "x_dither")
+    '("gint" "y_dither")
   )
 )
 
-(define-method get_from_image
+(define-method render_to_drawable_alpha
   (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_from_image")
-  (return-type "GdkPixbuf*")
+  (c-name "gdk_pixbuf_render_to_drawable_alpha")
+  (return-type "none")
+  (deprecated "use GdkDrawable::draw_pixbuf() and GdkPixbuf::render_threshold_alpha()instead")
   (parameters
-    '("GdkImage*" "src")
-    '("GdkColormap*" "cmap")
+    '("GdkDrawable*" "drawable")
     '("int" "src_x")
     '("int" "src_y")
     '("int" "dest_x")
     '("int" "dest_y")
     '("int" "width")
     '("int" "height")
-  )
-)
-
-(define-method get_has_alpha
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_has_alpha")
-  (return-type "gboolean")
-)
-
-(define-method get_height
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_height")
-  (return-type "int")
-)
-
-(define-method get_n_channels
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_n_channels")
-  (return-type "int")
+    '("GdkPixbufAlphaMode" "alpha_mode")
+    '("int" "alpha_threshold")
+    '("GdkRgbDither" "dither" (default "GDK_RGB_DITHER_NORMAL"))
+    '("gint" "x_dither")
+    '("gint" "y_dither")
+  )
 )
 
-(define-method get_option
+(define-method render_pixmap_and_mask
   (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_option")
-  (return-type "const-char*")
+  (c-name "gdk_pixbuf_render_pixmap_and_mask")
+  (return-type "none")
   (parameters
-    '("const-char*" "key")
+    '("GdkPixmap**" "pixmap_return")
+    '("GdkBitmap**" "mask_return")
+    '("int" "alpha_threshold" (default "127"))
   )
 )
 
-(define-method get_pixels
+(define-method get_from_drawable
   (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_pixels")
-  (return-type "guchar*")
+  (c-name "gdk_pixbuf_get_from_drawable")
+  (return-type "GdkPixbuf*")
+  (parameters
+    '("GdkDrawable*" "src")
+    '("GdkColormap*" "cmap")
+    '("int" "src_x")
+    '("int" "src_y")
+    '("int" "dest_x")
+    '("int" "dest_y")
+    '("int" "width")
+    '("int" "height")
+  )
 )
 
-(define-method get_rowstride
+(define-method get_from_image
   (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_rowstride")
-  (return-type "int")
+  (c-name "gdk_pixbuf_get_from_image")
+  (return-type "GdkPixbuf*")
+  (parameters
+    '("GdkImage*" "src")
+    '("GdkColormap*" "cmap")
+    '("int" "src_x")
+    '("int" "src_y")
+    '("int" "dest_x")
+    '("int" "dest_y")
+    '("int" "width")
+    '("int" "height")
+  )
 )
 
-(define-method get_width
+(define-method rotate_simple
   (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_get_width")
-  (return-type "int")
-)
-
-(define-method close
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_close")
-  (return-type "gboolean")
+  (c-name "gdk_pixbuf_rotate_simple")
+  (return-type "GdkPixbuf*")
   (parameters
-    '("GError**" "error")
+    '("int" "angle")
   )
+  (caller-owns-return #t)
 )
 
-(define-method get_animation
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_get_animation")
-  (return-type "GdkPixbufAnimation*")
-)
-
-(define-method get_format
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_get_format")
-  (return-type "GdkPixbufFormat*")
-)
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkpixmap.h
 
-(define-method get_pixbuf
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_get_pixbuf")
-  (return-type "GdkPixbuf*")
+(define-function gdk_pixmap_get_type
+  (c-name "gdk_pixmap_get_type")
+  (return-type "GType")
 )
 
-(define-function gdk_pixbuf_loader_get_type
-  (c-name "gdk_pixbuf_loader_get_type")
-  (return-type "GType")
+(define-function gdk_pixmap_new
+  (is-constructor-of "GdkPixmap")
+  (c-name "gdk_pixmap_new")
+  (caller-owns-return #t)
+  (return-type "GdkPixmap*")
+  (parameters
+    '("GdkDrawable*" "drawable" (null-ok))
+    '("gint" "width")
+    '("gint" "height")
+    '("gint" "depth" (default "-1"))
+  )
 )
 
-(define-function gdk_pixbuf_loader_new
-  (c-name "gdk_pixbuf_loader_new")
-  (return-type "GdkPixbufLoader*")
-  (deprecated "use GdkPixbufLoader() constructor instead")
+(define-function bitmap_create_from_data
+  (c-name "gdk_bitmap_create_from_data")
+  (return-type "GdkBitmap*")
+  (parameters
+    '("GdkDrawable*" "drawable" (null-ok))
+    '("const-guchar*" "data")
+    '("gint" "width")
+    '("gint" "height")
+  )
 )
 
-(define-function pixbuf_loader_new_with_mime_type
-  (c-name "gdk_pixbuf_loader_new_with_mime_type")
-  (return-type "GdkPixbufLoader*")
+(define-function pixmap_create_from_data
+  (c-name "gdk_pixmap_create_from_data")
+  (return-type "GdkPixmap*")
   (parameters
-    '("const-char*" "mime_type")
-    '("GError**" "error")
+    '("GdkDrawable*" "drawable" (null-ok))
+    '("const-guchar*" "data")
+    '("gint" "width")
+    '("gint" "height")
+    '("gint" "depth")
+    '("GdkColor*" "fg")
+    '("GdkColor*" "bg")
   )
 )
 
-(define-function gdk_pixbuf_loader_new_with_type
-  (is-constructor-of "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_new_with_type")
-  (caller-owns-return #t)
-  (return-type "GdkPixbufLoader*")
+(define-method create_from_xpm
+  (of-object "GdkPixmap")
+  (c-name "gdk_pixmap_create_from_xpm")
+  (return-type "GdkPixmap*")
+  (static #t)
   (parameters
-    '("const-char*" "image_type")
-    '("GError**" "error")
+    '("GdkDrawable*" "drawable")
+    '("GdkBitmap**" "mask")
+    '("GdkColor*" "transparent_color")
+    '("const-gchar*" "filename")
   )
 )
 
-(define-method set_size
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_set_size")
-  (return-type "none")
+(define-function pixmap_colormap_create_from_xpm
+  (c-name "gdk_pixmap_colormap_create_from_xpm")
+  (return-type "GdkPixmap*")
   (parameters
-    '("int" "width")
-    '("int" "height")
+    '("GdkDrawable*" "drawable")
+    '("GdkColormap*" "colormap")
+    '("GdkBitmap**" "mask")
+    '("GdkColor*" "transparent_color")
+    '("const-gchar*" "filename")
   )
 )
 
-(define-method write
-  (of-object "GdkPixbufLoader")
-  (c-name "gdk_pixbuf_loader_write")
-  (return-type "gboolean")
+(define-method create_from_xpm_data
+  (of-object "GdkPixmap")
+  (c-name "gdk_pixmap_create_from_xpm_d")
+  (return-type "GdkPixmap*")
+  (static #t)
   (parameters
-    '("const-guchar*" "buf")
-    '("gsize" "count")
-    '("GError**" "error")
+    '("GdkDrawable*" "drawable")
+    '("GdkBitmap**" "mask")
+    '("GdkColor*" "transparent_color")
+    '("gchar**" "data")
   )
 )
 
-(define-function gdk_pixbuf_new
-  (is-constructor-of "GdkPixbuf")
-  (c-name "gdk_pixbuf_new")
-  (caller-owns-return #t)
-  (return-type "GdkPixbuf*")
+(define-function pixmap_colormap_create_from_xpm_d
+  (c-name "gdk_pixmap_colormap_create_from_xpm_d")
+  (return-type "GdkPixmap*")
   (parameters
-    '("GdkColorspace" "colorspace")
-    '("gboolean" "has_alpha")
-    '("int" "bits_per_sample")
-    '("int" "width")
-    '("int" "height")
+    '("GdkDrawable*" "drawable")
+    '("GdkColormap*" "colormap")
+    '("GdkBitmap**" "mask")
+    '("GdkColor*" "transparent_color")
+    '("gchar**" "data")
   )
 )
 
-(define-function pixbuf_new_from_array
-  (is-constructor-of "GdkPixbuf")
-  (c-name "gdk_pixbuf_new_from_array")
+(define-function pixmap_foreign_new
+  (c-name "gdk_pixmap_foreign_new")
   (caller-owns-return #t)
-  (return-type "GdkPixbuf*")
+  (return-type "GdkPixmap*")
   (parameters
-    '("PyArrayObject*" "array")
-    '("GdkColorspace" "colorspace")
-    '("int" "bits_per_sample")
+    '("GdkNativeWindow" "anid")
   )
 )
 
-(define-function pixbuf_new_from_data
-  (is-constructor-of "GdkPixbuf")
-  (c-name "gdk_pixbuf_new_from_data")
-  (caller-owns-return #t)
-  (return-type "GdkPixbuf*")
+(define-function pixmap_lookup
+  (c-name "gdk_pixmap_lookup")
+  (return-type "GdkPixmap*")
   (parameters
-    '("const-guchar*" "data")
-    '("GdkColorspace" "colorspace")
-    '("gboolean" "has_alpha")
-    '("int" "bits_per_sample")
-    '("int" "width")
-    '("int" "height")
-    '("int" "rowstride")
-    '("GdkPixbufDestroyNotify" "destroy_fn")
-    '("gpointer" "destroy_fn_data")
+    '("GdkNativeWindow" "anid")
   )
 )
 
-(define-function pixbuf_new_from_file
-  (is-constructor-of "GdkPixbuf")
-  (c-name "gdk_pixbuf_new_from_file")
+(define-function pixmap_foreign_new_for_display
+  (c-name "gdk_pixmap_foreign_new_for_display")
   (caller-owns-return #t)
-  (return-type "GdkPixbuf*")
+  (return-type "GdkPixmap*")
   (parameters
-    '("const-char*" "filename")
-    '("GError**" "error")
+    '("GdkDisplay*" "display")
+    '("GdkNativeWindow" "anid")
   )
 )
 
-(define-function pixbuf_new_from_file_at_size
-  (is-constructor-of "GdkPixbuf")
-  (c-name "gdk_pixbuf_new_from_file_at_size")
-  (caller-owns-return #t)
-  (return-type "GdkPixbuf*")
+(define-function pixmap_lookup_for_display
+  (c-name "gdk_pixmap_lookup_for_display")
+  (return-type "GdkPixmap*")
   (parameters
-    '("const-char*" "filename")
-    '("int" "width")
-    '("int" "height")
-    '("GError**" "error")
+    '("GdkDisplay*" "display")
+    '("GdkNativeWindow" "anid")
   )
 )
 
-(define-function pixbuf_new_from_inline
-  (is-constructor-of "GdkPixbuf")
-  (c-name "gdk_pixbuf_new_from_inline")
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkproperty.h
+
+(define-method name
+  (of-object "GdkAtom")
+  (c-name "gdk_atom_name")
   (caller-owns-return #t)
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("gint" "data_length")
-    '("const-guchar*" "data")
-    '("gboolean" "copy_pixels")
-    '("GError**" "error")
-  )
+  (return-type "gchar*")
 )
 
-(define-function pixbuf_new_from_xpm_data
-  (is-constructor-of "GdkPixbuf")
-  (c-name "gdk_pixbuf_new_from_xpm_data")
-  (caller-owns-return #t)
-  (return-type "GdkPixbuf*")
+(define-function atom_intern
+  (c-name "gdk_atom_intern")
+  (return-type "GdkAtom")
   (parameters
-    '("const-char**" "data")
+    '("gchar*" "atom_name")
+    '("gboolean" "only_if_exists" (default "FALSE"))
   )
 )
 
-(define-method subpixbuf
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_new_subpixbuf")
-  (caller-owns-return #t)
-  (return-type "GdkPixbuf*")
+(define-method property_get
+  (of-object "GdkWindow")
+  (c-name "gdk_property_get")
+  (return-type "gboolean")
   (parameters
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "width")
-    '("int" "height")
+    '("GdkAtom" "property")
+    '("GdkAtom" "type")
+    '("gulong" "offset")
+    '("gulong" "length")
+    '("gint" "pdelete")
+    '("GdkAtom*" "actual_property_type")
+    '("gint*" "actual_format")
+    '("gint*" "actual_length")
+    '("guchar**" "data")
   )
 )
 
-(define-method render_pixmap_and_mask
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_render_pixmap_and_mask")
+(define-method property_change
+  (of-object "GdkWindow")
+  (c-name "gdk_property_change")
   (return-type "none")
   (parameters
-    '("GdkPixmap**" "pixmap_return")
-    '("GdkBitmap**" "mask_return")
-    '("int" "alpha_threshold" (default "127"))
+    '("GdkAtom" "property")
+    '("GdkAtom" "type")
+    '("gint" "format")
+    '("GdkPropMode" "mode")
+    '("const-guchar*" "data")
+    '("gint" "nelements")
   )
 )
 
-(define-method render_to_drawable
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_render_to_drawable")
+(define-method property_delete
+  (of-object "GdkWindow")
+  (c-name "gdk_property_delete")
   (return-type "none")
-  (deprecated "use GdkDrawable::draw_pixbuf() instead")
   (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkGC*" "gc")
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "width")
-    '("int" "height")
-    '("GdkRgbDither" "dither" (default "GDK_RGB_DITHER_NORMAL"))
-    '("gint" "x_dither")
-    '("gint" "y_dither")
+    '("GdkAtom" "property")
   )
 )
 
-(define-method render_to_drawable_alpha
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_render_to_drawable_alpha")
-  (return-type "none")
-  (deprecated "use GdkDrawable::draw_pixbuf() and GdkPixbuf::render_threshold_alpha()instead")
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkrgb.h
+
+(define-function rgb_xpixel_from_rgb
+  (c-name "gdk_rgb_xpixel_from_rgb")
+  (return-type "gulong")
   (parameters
-    '("GdkDrawable*" "drawable")
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "width")
-    '("int" "height")
-    '("GdkPixbufAlphaMode" "alpha_mode")
-    '("int" "alpha_threshold")
-    '("GdkRgbDither" "dither" (default "GDK_RGB_DITHER_NORMAL"))
-    '("gint" "x_dither")
-    '("gint" "y_dither")
+    '("guint32" "rgb")
   )
 )
 
-(define-method saturate_and_pixelate
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_saturate_and_pixelate")
+(define-function rgb_gc_set_foreground
+  (c-name "gdk_rgb_gc_set_foreground")
   (return-type "none")
   (parameters
-    '("GdkPixbuf*" "dest")
-    '("gfloat" "saturation")
-    '("gboolean" "pixelate")
+    '("GdkGC*" "gc")
+    '("guint32" "rgb")
   )
 )
 
-(define-method save
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_save")
-  (return-type "gboolean")
+(define-function rgb_gc_set_background
+  (c-name "gdk_rgb_gc_set_background")
+  (return-type "none")
   (parameters
-    '("const-char*" "filename")
-    '("const-char*" "type")
-    '("GError**" "error")
+    '("GdkGC*" "gc")
+    '("guint32" "rgb")
   )
-  (varargs #t)
 )
 
-(define-method savev
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_savev")
-  (return-type "gboolean")
+(define-method draw_rgb_image
+  (of-object "GdkDrawable")
+  (c-name "gdk_draw_rgb_image")
+  (return-type "none")
   (parameters
-    '("const-char*" "filename")
-    '("const-char*" "type")
-    '("char**" "option_keys")
-    '("char**" "option_values")
-    '("GError**" "error")
+    '("GdkGC*" "gc")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("GdkRgbDither" "dith")
+    '("guchar*" "rgb_buf")
+    '("gint" "rowstride")
   )
 )
 
-(define-method scale
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_scale")
+(define-method draw_rgb_image_dithalign
+  (of-object "GdkDrawable")
+  (c-name "gdk_draw_rgb_image_dithalign")
   (return-type "none")
   (parameters
-    '("GdkPixbuf*" "dest")
-    '("int" "dest_x")
-    '("int" "dest_y")
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("double" "offset_x")
-    '("double" "offset_y")
-    '("double" "scale_x")
-    '("double" "scale_y")
-    '("GdkInterpType" "interp_type")
+    '("GdkGC*" "gc")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("GdkRgbDither" "dith")
+    '("guchar*" "rgb_buf")
+    '("gint" "rowstride")
+    '("gint" "xdith")
+    '("gint" "ydith")
   )
 )
 
-(define-method scale_simple
-  (of-object "GdkPixbuf")
-  (c-name "gdk_pixbuf_scale_simple")
-  (caller-owns-return #t)
-  (return-type "GdkPixbuf*")
+(define-method draw_rgb_32_image
+  (of-object "GdkDrawable")
+  (c-name "gdk_draw_rgb_32_image")
+  (return-type "none")
   (parameters
-    '("int" "dest_width")
-    '("int" "dest_height")
-    '("GdkInterpType" "interp_type")
+    '("GdkGC*" "gc")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("GdkRgbDither" "dith")
+    '("guchar*" "buf")
+    '("gint" "rowstride")
   )
 )
 
-(define-function pixmap_colormap_create_from_xpm
-  (c-name "gdk_pixmap_colormap_create_from_xpm")
-  (return-type "GdkPixmap*")
+(define-method draw_gray_image
+  (of-object "GdkDrawable")
+  (c-name "gdk_draw_gray_image")
+  (return-type "none")
   (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkColormap*" "colormap")
-    '("GdkBitmap**" "mask")
-    '("GdkColor*" "transparent_color")
-    '("const-gchar*" "filename")
+    '("GdkGC*" "gc")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("GdkRgbDither" "dith")
+    '("guchar*" "buf")
+    '("gint" "rowstride")
   )
 )
 
-(define-function pixmap_colormap_create_from_xpm_d
-  (c-name "gdk_pixmap_colormap_create_from_xpm_d")
-  (return-type "GdkPixmap*")
+(define-function rgb_cmap_new
+  (c-name "gdk_rgb_cmap_new")
+  (return-type "GdkRgbCmap*")
   (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkColormap*" "colormap")
-    '("GdkBitmap**" "mask")
-    '("GdkColor*" "transparent_color")
-    '("gchar**" "data")
+    '("guint32*" "colors")
+    '("gint" "n_colors")
   )
 )
 
-(define-function pixmap_create_from_data
-  (c-name "gdk_pixmap_create_from_data")
-  (return-type "GdkPixmap*")
+(define-method draw_indexed_image
+  (of-object "GdkDrawable")
+  (c-name "gdk_draw_indexed_image")
+  (return-type "none")
   (parameters
-    '("GdkDrawable*" "drawable" (null-ok))
-    '("const-guchar*" "data")
+    '("GdkGC*" "gc")
+    '("gint" "x")
+    '("gint" "y")
     '("gint" "width")
     '("gint" "height")
-    '("gint" "depth")
-    '("GdkColor*" "fg")
-    '("GdkColor*" "bg")
+    '("GdkRgbDither" "dith")
+    '("guchar*" "buf")
+    '("gint" "rowstride")
+    '("GdkRgbCmap*" "cmap")
   )
 )
 
-(define-method create_from_xpm
-  (of-object "GdkPixmap")
-  (c-name "gdk_pixmap_create_from_xpm")
-  (return-type "GdkPixmap*")
-  (static #t)
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkBitmap**" "mask")
-    '("GdkColor*" "transparent_color")
-    '("const-gchar*" "filename")
-  )
-)
-
-(define-method create_from_xpm_data
-  (of-object "GdkPixmap")
-  (c-name "gdk_pixmap_create_from_xpm_d")
-  (return-type "GdkPixmap*")
-  (static #t)
-  (parameters
-    '("GdkDrawable*" "drawable")
-    '("GdkBitmap**" "mask")
-    '("GdkColor*" "transparent_color")
-    '("gchar**" "data")
-  )
+(define-function rgb_ditherable
+  (c-name "gdk_rgb_ditherable")
+  (return-type "gboolean")
 )
 
-(define-function pixmap_foreign_new
-  (c-name "gdk_pixmap_foreign_new")
-  (caller-owns-return #t)
-  (return-type "GdkPixmap*")
+(define-function rgb_set_verbose
+  (c-name "gdk_rgb_set_verbose")
+  (return-type "none")
   (parameters
-    '("GdkNativeWindow" "anid")
+    '("gboolean" "verbose")
   )
 )
 
-(define-function pixmap_foreign_new_for_display
-  (c-name "gdk_pixmap_foreign_new_for_display")
-  (caller-owns-return #t)
-  (return-type "GdkPixmap*")
+(define-function rgb_set_install
+  (c-name "gdk_rgb_set_install")
+  (return-type "none")
   (parameters
-    '("GdkDisplay*" "display")
-    '("GdkNativeWindow" "anid")
+    '("gboolean" "install")
   )
 )
 
-(define-function gdk_pixmap_get_type
-  (c-name "gdk_pixmap_get_type")
-  (return-type "GType")
-)
-
-(define-function pixmap_lookup
-  (c-name "gdk_pixmap_lookup")
-  (return-type "GdkPixmap*")
+(define-function rgb_set_min_colors
+  (c-name "gdk_rgb_set_min_colors")
+  (return-type "none")
   (parameters
-    '("GdkNativeWindow" "anid")
+    '("gint" "min_colors")
   )
 )
 
-(define-function pixmap_lookup_for_display
-  (c-name "gdk_pixmap_lookup_for_display")
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkDisplay*" "display")
-    '("GdkNativeWindow" "anid")
-  )
+(define-function rgb_get_colormap
+  (c-name "gdk_rgb_get_colormap")
+  (return-type "GdkColormap*")
 )
 
-(define-function gdk_pixmap_new
-  (is-constructor-of "GdkPixmap")
-  (c-name "gdk_pixmap_new")
-  (caller-owns-return #t)
-  (return-type "GdkPixmap*")
-  (parameters
-    '("GdkDrawable*" "drawable" (null-ok))
-    '("gint" "width")
-    '("gint" "height")
-    '("gint" "depth" (default "-1"))
-  )
+(define-function rgb_get_cmap
+  (c-name "gdk_rgb_get_cmap")
+  (return-type "GdkColormap*")
+  (deprecated "use gdk::rgb_get_colormap() instead")
 )
 
-(define-function pointer_grab
-  (c-name "gdk_pointer_grab")
-  (return-type "GdkGrabStatus")
-  (parameters
-    '("GdkWindow*" "window")
-    '("gboolean" "owner_events" (default "FALSE") (null-ok))
-    '("GdkEventMask" "event_mask" (null-ok))
-    '("GdkWindow*" "confine_to" (default "NULL") (null-ok))
-    '("GdkCursor*" "cursor" (default "NULL") (null-ok))
-    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
-  )
+(define-function rgb_get_visual
+  (c-name "gdk_rgb_get_visual")
+  (return-type "GdkVisual*")
 )
 
-(define-function pointer_is_grabbed
-  (c-name "gdk_pointer_is_grabbed")
-  (return-type "gboolean")
+(define-function rgb_init
+  (c-name "gdk_rgb_init")
+  (return-type "none")
 )
 
-(define-function pointer_ungrab
-  (c-name "gdk_pointer_ungrab")
+(define-function rgb_find_color
+  (c-name "gdk_rgb_find_color")
   (return-type "none")
   (parameters
-    '("guint32" "time" (default "GDK_CURRENT_TIME") (null-ok))
+    '("GdkColormap*" "colormap")
+    '("GdkColor*" "color")
   )
 )
 
-(define-method property_change
-  (of-object "GdkWindow")
-  (c-name "gdk_property_change")
+(define-function draw_rgb_32_image_dithalign
+  (c-name "gdk_draw_rgb_32_image_dithalign")
   (return-type "none")
   (parameters
-    '("GdkAtom" "property")
-    '("GdkAtom" "type")
-    '("gint" "format")
-    '("GdkPropMode" "mode")
-    '("const-guchar*" "data")
-    '("gint" "nelements")
+    '("GdkDrawable*" "drawable")
+    '("GdkGC*" "gc")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "width")
+    '("gint" "height")
+    '("GdkRgbDither" "dith")
+    '("guchar*" "buf")
+    '("gint" "rowstride")
+    '("gint" "xdith")
+    '("gint" "ydith")
   )
 )
 
-(define-method property_delete
-  (of-object "GdkWindow")
-  (c-name "gdk_property_delete")
+(define-method free
+  (of-object "GdkRgbCmap")
+  (c-name "gdk_rgb_cmap_free")
   (return-type "none")
-  (parameters
-    '("GdkAtom" "property")
-  )
 )
 
-(define-method property_get
-  (of-object "GdkWindow")
-  (c-name "gdk_property_get")
+(define-function rgb_colormap_ditherable
+  (c-name "gdk_rgb_colormap_ditherable")
   (return-type "gboolean")
   (parameters
-    '("GdkAtom" "property")
-    '("GdkAtom" "type")
-    '("gulong" "offset")
-    '("gulong" "length")
-    '("gint" "pdelete")
-    '("GdkAtom*" "actual_property_type")
-    '("gint*" "actual_format")
-    '("gint*" "actual_length")
-    '("guchar**" "data")
+    '("GdkColormap*" "cmap")
   )
 )
 
-(define-function query_depths
-  (c-name "gdk_query_depths")
-  (return-type "none")
-  (parameters
-    '("gint**" "depths")
-    '("gint*" "count")
-  )
+;; From /opt/gtk2/include/gtk-2.0/gdk/gdkscreen.h
+(define-function gdk_screen_get_type
+  (c-name "gdk_screen_get_type")
+  (return-type "GType")
 )
 
-(define-function query_visual_types
-  (c-name "gdk_query_visual_types")
-  (return-type "none")
-  (parameters
-    '("GdkVisualType**" "visual_types")
-    '("gint*" "count")
-  )
+(define-method get_default_colormap
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_get_default_colormap")
+  (return-type "GdkColormap*")
 )
 
-(define-method intersect
-  (of-object "GdkRectangle")
-  (c-name "gdk_rectangle_intersect")
-  (return-type "gboolean")
+(define-method set_default_colormap
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_set_default_colormap")
+  (return-type "none")
   (parameters
-    '("GdkRectangle*" "src1")
-    '("GdkRectangle*" "src2")
-    '("GdkRectangle*" "dest")
+    '("GdkColormap*" "colormap")
   )
 )
 
-(define-function gdk_rectangle_new
-  (is-constructor-of "GdkRectangle")
-  (c-name "gdk_rectangle_new")
-  (caller-owns-return #t)
-  (return-type "GdkRectangle")
+(define-method get_system_colormap
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_get_system_colormap")
+  (return-type "GdkColormap*")
 )
 
-(define-method union
-  (of-object "GdkRectangle")
-  (c-name "gdk_rectangle_union")
-  (return-type "void")
-  (parameters
-    '("GdkRectangle*" "src1")
-    '("GdkRectangle*" "src2")
-    '("GdkRectangle*" "dest")
-  )
+(define-method get_system_visual
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_get_system_visual")
+  (return-type "GdkVisual*")
 )
 
-(define-function rgb_cmap_new
-  (c-name "gdk_rgb_cmap_new")
-  (return-type "GdkRgbCmap*")
-  (parameters
-    '("guint32*" "colors")
-    '("gint" "n_colors")
-  )
+(define-method get_rgb_colormap
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_get_rgb_colormap")
+  (return-type "GdkColormap*")
 )
 
-(define-function rgb_ditherable
-  (c-name "gdk_rgb_ditherable")
-  (return-type "gboolean")
+(define-method get_rgb_visual
+  (of-object "GdkScreen")
+  (c-name "gdk_screen_get_rgb_visual")
+  (return-type "GdkVisual*")
 )
 
-(define-function rgb_gc_
From:	Elizabeth Marie Smith	Date:	Sat Jul 12 17:55:10 2008
Subject:	cvs: php-gtk /ext/gtk+ gdk-2.12.overrides gdk-2.8-types.defs gdk-2.8.defs gdk-types.defs gdk.defs pango-types.defs