summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog23
-rw-r--r--atk-types.defs6
-rw-r--r--atk.defs146
-rw-r--r--configure.in21
-rw-r--r--gtk/Makefile.am7
-rw-r--r--gtk/gdk-2.12.defs157
-rw-r--r--gtk/gtk-2.12-types.defs60
-rw-r--r--gtk/gtk-2.12.defs1131
-rw-r--r--gtk/gtkunixprint.defs24
-rw-r--r--pango-types.defs24
-rw-r--r--pango.defs248
-rw-r--r--pangocairo.defs22
12 files changed, 1864 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e75b57e8..dca6aa4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2007-07-11 Gian Mario Tagliaretti <gianmt@gnome.org>
+
+ reviewed by: Johan
+
+ * configure.in: bump version to 2.11.0, bump pango required version
+ to 1.16.0, bump atk version to 1.12.0. Conditional build for gtk/gdk
+ 2.12 API.
+
+ * pango-types.defs,
+ * pango.defs,
+ * pangocairo.defs: update with API up to 1.16.
+
+ * atk-types.defs,
+ * atk.defs: update with API up to 1.12.
+
+ * gtk/Makefile.am: conditional build for new API 2.12.
+
+ * gtk/gtk-2.12-types.defs,
+ * gtk/gtk-2.12.defs,
+ * gtk/gdk-2.12.defs: new files holding 2.12 API.
+
+ * gtk/gtkunixprint.defs: update with API 2.12.
+
2007-07-10 Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
* tests/test_actiongroup.py (ActionTest): Add a gtk.Action subclass test.
diff --git a/atk-types.defs b/atk-types.defs
index becb6ed2..f6634803 100644
--- a/atk-types.defs
+++ b/atk-types.defs
@@ -101,6 +101,12 @@
(gtype-id "ATK_TYPE_EDITABLE_TEXT")
)
+(define-interface HyperlinkImpl
+ (in-module "Atk")
+ (c-name "AtkHyperlinkImpl")
+ (gtype-id "ATK_TYPE_HYPERLINK_IMPL")
+)
+
(define-interface Hypertext
(in-module "Atk")
(c-name "AtkHypertext")
diff --git a/atk.defs b/atk.defs
index 191b0f6d..dc652eae 100644
--- a/atk.defs
+++ b/atk.defs
@@ -322,6 +322,12 @@
(return-type "gint")
)
+(define-method get_alpha
+ (of-object "AtkComponent")
+ (c-name "atk_component_get_alpha")
+ (return-type "gdouble")
+)
+
(define-virtual add_focus_handler
(of-object "AtkComponent")
(return-type "guint")
@@ -443,6 +449,11 @@
)
)
+(define-virtual get_alpha
+ (of-object "AtkComponent")
+ (return-type "gdouble")
+)
+
;; From /usr/include/atk-1.0/atk/atkdocument.h
@@ -464,6 +475,32 @@
(return-type "gpointer")
)
+(define-method get_attributes
+ (of-object "AtkDocument")
+ (c-name "atk_document_get_attributes")
+ (return-type "AtkAttributeSet*")
+)
+
+(define-method get_attribute_value
+ (of-object "AtkDocument")
+ (c-name "atk_document_get_attribute_value")
+ (return-type "const-gchar*")
+ (parameters
+ '("const-gchar*" "attribute_name")
+ )
+)
+
+(define-method set_attribute_value
+ (of-object "AtkDocument")
+ (c-name "atk_document_set_attribute_value")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "attribute_name")
+ '("const-gchar*" "attribute_value")
+ )
+)
+
+
(define-virtual get_document_type
(of-object "AtkDocument")
(return-type "const-gchar*")
@@ -474,6 +511,28 @@
(return-type "gpointer")
)
+(define-virtual get_document_attributes
+ (of-object "AtkDocument")
+ (return-type "AtkAttributeSet*")
+)
+
+(define-virtual get_document_attribute_value
+ (of-object "AtkDocument")
+ (return-type "G_CONST_RETURNgchar*")
+ (parameters
+ '("const-gchar*" "attribute_name")
+ )
+)
+
+(define-virtual set_document_attribute
+ (of-object "AtkDocument")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "attribute_name")
+ '("const-gchar*" "attribute_value")
+ )
+)
+
;; From /usr/include/atk-1.0/atk/atkeditabletext.h
@@ -706,6 +765,13 @@
(return-type "gboolean")
)
+(define-method get_attributes
+ (of-object "AtkObject")
+ (c-name "atk_object_get_attributes")
+ (return-type "AtkAttributeSet*")
+)
+
+
(define-virtual get_uri
(of-object "AtkHyperlink")
(return-type "gchar*")
@@ -757,6 +823,31 @@
(return-type "none")
)
+(define-virtual get_attributes
+ (of-object "AtkObject")
+ (return-type "AtkAttributeSet*")
+)
+
+
+
+;; From atkhyperlinkimpl.h
+
+(define-function atk_hyperlink_impl_get_type
+ (c-name "atk_hyperlink_impl_get_type")
+ (return-type "GType")
+)
+
+(define-method get_hyperlink
+ (of-object "AtkHyperlinkImpl")
+ (c-name "atk_hyperlink_impl_get_hyperlink")
+ (return-type "AtkHyperlink*")
+)
+
+(define-virtual get_hyperlink
+ (of-object "AtkHyperlinkImpl")
+ (return-type "AtkHyperlink*")
+)
+
;; From /usr/include/atk-1.0/atk/atkhypertext.h
@@ -1439,6 +1530,15 @@
(return-type "GPtrArray*")
)
+(define-method add_target
+ (of-object "AtkRelation")
+ (c-name "atk_relation_add_target")
+ (return-type "none")
+ (parameters
+ '("AtkObject*" "target")
+ )
+)
+
;; From /usr/include/atk-1.0/atk/atkrelationset.h
@@ -1504,7 +1604,17 @@
'("AtkRelationType" "relationship")
)
)
-
+
+(define-method add_relation_by_type
+ (of-object "AtkRelationSet")
+ (c-name "atk_relation_set_add_relation_by_type")
+ (return-type "none")
+ (parameters
+ '("AtkRelationType" "relationship")
+ '("AtkObject*" "target")
+ )
+)
+
;; From /usr/include/atk-1.0/atk/atkselection.h
@@ -1784,6 +1894,15 @@
)
)
+(define-method get_uri
+ (of-object "AtkStreamableContent")
+ (c-name "atk_streamable_content_get_uri")
+ (return-type "gchar*")
+ (parameters
+ '("const-gchar*" "mime_type")
+ )
+)
+
(define-virtual get_n_mime_types
(of-object "AtkStreamableContent")
(return-type "gint")
@@ -1805,6 +1924,14 @@
)
)
+(define-virtual get_uri
+ (of-object "AtkStreamableContent")
+ (return-type "G_CONST_RETURNgchar*")
+ (parameters
+ '("const-gchar*" "mime_type")
+ )
+)
+
;; From /usr/include/atk-1.0/atk/atktable.h
@@ -2962,6 +3089,15 @@
)
)
+(define-method get_minimum_increment
+ (of-object "AtkValue")
+ (c-name "atk_value_get_minimum_increment")
+ (return-type "none")
+ (parameters
+ '("GValue*" "value")
+ )
+)
+
(define-virtual get_current_value
(of-object "AtkValue")
(return-type "none")
@@ -2994,6 +3130,14 @@
)
)
+(define-virtual get_minimum_increment
+ (of-object "AtkValue")
+ (return-type "none")
+ (parameters
+ '("GValue*" "value")
+ )
+)
+
(define-function role_get_name
(c-name "atk_role_get_name")
(return-type "const-gchar*")
diff --git a/configure.in b/configure.in
index a57c5c84..6e439401 100644
--- a/configure.in
+++ b/configure.in
@@ -3,14 +3,14 @@ AC_PREREQ(2.52)
dnl the pygtk version number
m4_define(pygtk_major_version, 2)
-m4_define(pygtk_minor_version, 10)
-m4_define(pygtk_micro_version, 5)
+m4_define(pygtk_minor_version, 11)
+m4_define(pygtk_micro_version, 0)
m4_define(pygtk_version, pygtk_major_version.pygtk_minor_version.pygtk_micro_version)
dnl versions of packages we require ...
m4_define(glib_required_version, 2.8.0)
-m4_define(pango_required_version, 1.10.0)
-m4_define(atk_required_version, 1.8.0)
+m4_define(pango_required_version, 1.16.0)
+m4_define(atk_required_version, 1.12.0)
m4_define(gtk_required_version, 2.8.0)
m4_define(libglade_required_version, 2.5.0)
m4_define(gtkunixprint_required_version, 2.9.0)
@@ -220,6 +220,19 @@ if test $have_pycairo; then
AM_CONDITIONAL(HAVE_GTK_2_10, $have_gtk_210)
AC_SUBST(HAVE_GTK_2_10)
AC_DEFINE([HAVE_GTK_2_10], [$have_gtk_210], [If Gtk 2.10 was found])
+
+ dnl check for gtk 2.12
+ PKG_CHECK_MODULES(GTK212, gtk+-2.0 >= 2.11.6,
+ HAVE_GTK_212="yes", HAVE_GTK_212="no")
+
+ if test "x$HAVE_GTK_212" = "xyes"; then
+ gtk_version="2.12"
+ have_gtk_212=true
+ fi
+
+ AM_CONDITIONAL(HAVE_GTK_2_12, $have_gtk_212)
+ AC_SUBST(HAVE_GTK_2_12)
+ AC_DEFINE([HAVE_GTK_2_12], [$have_gtk_212], [If Gtk 2.12 was found])
dnl libglade
PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= libglade_required_version],
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2a5f19ec..2862bfe6 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -47,6 +47,7 @@ GTK_TYPES_DEFS = gtk-base-types.defs
GDK_TYPES_DEFS = gdk-base-types.defs
GTK_2_10_DEFS = gdk-2.10.defs gtk-2.10.defs gtk-2.10-types.defs
+GTK_2_12_DEFS = gdk-2.12.defs gtk-2.12.defs gtk-2.12-types.defs
if HAVE_GTK_2_10
GDK_DEFS += gdk-2.10.defs
@@ -54,6 +55,12 @@ GTK_DEFS += gtk-2.10.defs
GTK_TYPES_DEFS += gtk-2.10-types.defs
endif
+if HAVE_GTK_2_12
+GDK_DEFS += gdk-2.12.defs
+GTK_DEFS += gtk-2.12.defs
+GTK_TYPES_DEFS += gtk-2.12-types.defs
+endif
+
CREATEDEFS = $(PYTHON) $(top_srcdir)/codegen/createdefs.py
GDK_OVERRIDES = \
diff --git a/gtk/gdk-2.12.defs b/gtk/gdk-2.12.defs
new file mode 100644
index 00000000..9fe26080
--- /dev/null
+++ b/gtk/gdk-2.12.defs
@@ -0,0 +1,157 @@
+;; From gdkcolor.h
+
+(define-method to_string
+ (of-object "GdkColor")
+ (c-name "gdk_color_to_string")
+ (return-type "gchar*")
+)
+
+
+
+;; From gdkdisplay.h
+
+(define-method supports_composite
+ (of-object "GdkDisplay")
+ (c-name "gdk_display_supports_composite")
+ (return-type "gboolean")
+)
+
+
+
+;; From gdkevents.h
+
+(define-function event_request_motions
+ (c-name "gdk_event_request_motions")
+ (return-type "none")
+ (parameters
+ '("GdkEventMotion*" "event")
+ )
+)
+
+
+
+;; From gdkkeys.h
+
+(define-method have_bidi_layouts
+ (of-object "GdkKeymap")
+ (c-name "gdk_keymap_have_bidi_layouts")
+ (return-type "gboolean")
+)
+
+
+
+;; From gdkpango.h
+
+(define-function gdk_pango_attr_emboss_color_new
+ (c-name "gdk_pango_attr_emboss_color_new")
+ (is-constructor-of "GdkPangoAttrEmbossColor")
+ (return-type "PangoAttribute*")
+ (parameters
+ '("const-GdkColor*" "color")
+ )
+)
+
+
+
+;; From gdkwindow.h
+
+(define-method set_composited
+ (of-object "GdkWindow")
+ (c-name "gdk_window_set_composited")
+ (return-type "none")
+ (parameters
+ '("gboolean" "composited")
+ )
+)
+
+(define-method set_startup_id
+ (of-object "GdkWindow")
+ (c-name "gdk_window_set_startup_id")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "startup_id")
+ )
+)
+
+(define-method beep
+ (of-object "GdkWindow")
+ (c-name "gdk_window_beep")
+ (return-type "none")
+)
+
+(define-method set_opacity
+ (of-object "GdkWindow")
+ (c-name "gdk_window_set_opacity")
+ (return-type "none")
+ (parameters
+ '("gdouble" "opacity")
+ )
+)
+
+
+
+;; From gdkx.h
+
+(define-function x11_display_get_startup_notification_id
+ (c-name "gdk_x11_display_get_startup_notification_id")
+ (return-type "const-gchar*")
+ (parameters
+ '("GdkDisplay*" "display")
+ )
+)
+
+(define-function x11_display_broadcast_startup_message
+ (c-name "gdk_x11_display_broadcast_startup_message")
+ (return-type "none")
+ (parameters
+ '("GdkDisplay*" "display")
+ '("const-char*" "message_type")
+ )
+ (varargs #t)
+)
+
+
+
+;; From gdk.h
+
+(define-function threads_add_idle_full
+ (c-name "gdk_threads_add_idle_full")
+ (return-type "guint")
+ (parameters
+ '("gint" "priority")
+ '("GSourceFunc" "function")
+ '("gpointer" "data")
+ '("GDestroyNotify" "notify")
+ )
+)
+
+(define-function threads_add_idle
+ (c-name "gdk_threads_add_idle")
+ (return-type "guint")
+ (parameters
+ '("GSourceFunc" "function")
+ '("gpointer" "data")
+ )
+)
+
+(define-function threads_add_timeout_full
+ (c-name "gdk_threads_add_timeout_full")
+ (return-type "guint")
+ (parameters
+ '("gint" "priority")
+ '("guint" "interval")
+ '("GSourceFunc" "function")
+ '("gpointer" "data")
+ '("GDestroyNotify" "notify")
+ )
+)
+
+(define-function threads_add_timeout
+ (c-name "gdk_threads_add_timeout")
+ (return-type "guint")
+ (parameters
+ '("guint" "interval")
+ '("GSourceFunc" "function")
+ '("gpointer" "data")
+ )
+)
diff --git a/gtk/gtk-2.12-types.defs b/gtk/gtk-2.12-types.defs
new file mode 100644
index 00000000..86d03f16
--- /dev/null
+++ b/gtk/gtk-2.12-types.defs
@@ -0,0 +1,60 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-interface Buildable
+ (in-module "Gtk")
+ (c-name "GtkBuildable")
+ (gtype-id "GTK_TYPE_BUILDABLE")
+)
+
+(define-object Builder
+ (in-module "Gtk")
+ (parent "GObject")
+ (c-name "GtkBuilder")
+ (gtype-id "GTK_TYPE_BUILDER")
+)
+
+(define-object RecentAction
+ (in-module "Gtk")
+ (parent "GtkAction")
+ (c-name "GtkRecentAction")
+ (gtype-id "GTK_TYPE_RECENT_ACTION")
+)
+
+(define-object ScaleButton
+ (in-module "Gtk")
+ (parent "GtkButton")
+ (c-name "GtkScaleButton")
+ (gtype-id "GTK_TYPE_SCALE_BUTTON")
+)
+
+(define-object Tooltip
+ (in-module "Gtk")
+ (parent "GObject")
+ (c-name "GtkTooltip")
+ (gtype-id "GTK_TYPE_TOOLTIP")
+)
+
+(define-object VolumeButton
+ (in-module "Gtk")
+ (parent "GtkScaleButton")
+ (c-name "GtkVolumeButton")
+ (gtype-id "GTK_TYPE_VOLUME_BUTTON")
+)
+
+
+;; Enumerations and flags ...
+
+(define-enum BuilderError
+ (in-module "Gtk")
+ (c-name "GtkBuilderError")
+ (gtype-id "GTK_TYPE_BUILDER_ERROR")
+ (values
+ '("invalid-type-function" "GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION")
+ '("unhandled-tag" "GTK_BUILDER_ERROR_UNHANDLED_TAG")
+ '("missing-attribute" "GTK_BUILDER_ERROR_MISSING_ATTRIBUTE")
+ '("invalid-attribute" "GTK_BUILDER_ERROR_INVALID_ATTRIBUTE")
+ '("invalid-tag" "GTK_BUILDER_ERROR_INVALID_TAG")
+ '("missing-property-value" "GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE")
+ '("invalid-value" "GTK_BUILDER_ERROR_INVALID_VALUE")
+ )
+)
diff --git a/gtk/gtk-2.12.defs b/gtk/gtk-2.12.defs
new file mode 100644
index 00000000..0ddbc6bb
--- /dev/null
+++ b/gtk/gtk-2.12.defs
@@ -0,0 +1,1131 @@
+;; -*- scheme -*-
+
+(include "gtk-2.12-types.defs")
+
+;; From gtkbuildable.h
+
+(define-function gtk_buildable_get_type
+ (c-name "gtk_buildable_get_type")
+ (return-type "GType")
+)
+
+(define-method set_name
+ (of-object "GtkBuildable")
+ (c-name "gtk_buildable_set_name")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "name")
+ )
+)
+
+(define-method get_name
+ (of-object "GtkBuildable")
+ (c-name "gtk_buildable_get_name")
+ (return-type "const-gchar*")
+)
+
+(define-method add_child
+ (of-object "GtkBuildable")
+ (c-name "gtk_buildable_add_child")
+ (return-type "none")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("GObject*" "child")
+ '("const-gchar*" "type")
+ )
+)
+
+(define-method set_buildable_property
+ (of-object "GtkBuildable")
+ (c-name "gtk_buildable_set_buildable_property")
+ (return-type "none")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("const-gchar*" "name")
+ '("const-GValue*" "value")
+ )
+)
+
+(define-method construct_child
+ (of-object "GtkBuildable")
+ (c-name "gtk_buildable_construct_child")
+ (return-type "GObject*")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("const-gchar*" "name")
+ )
+)
+
+(define-method custom_tag_start
+ (of-object "GtkBuildable")
+ (c-name "gtk_buildable_custom_tag_start")
+ (return-type "gboolean")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("GObject*" "child")
+ '("const-gchar*" "tagname")
+ '("GMarkupParser*" "parser")
+ '("gpointer*" "data")
+ )
+)
+
+(define-method custom_tag_end
+ (of-object "GtkBuildable")
+ (c-name "gtk_buildable_custom_tag_end")
+ (return-type "none")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("GObject*" "child")
+ '("const-gchar*" "tagname")
+ '("gpointer*" "data")
+ )
+)
+
+(define-method custom_finished
+ (of-object "GtkBuildable")
+ (c-name "gtk_buildable_custom_finished")
+ (return-type "none")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("GObject*" "child")
+ '("const-gchar*" "tagname")
+ '("gpointer" "data")
+ )
+)
+
+(define-method parser_finished
+ (of-object "GtkBuildable")
+ (c-name "gtk_buildable_parser_finished")
+ (return-type "none")
+ (parameters
+ '("GtkBuilder*" "builder")
+ )
+)
+
+(define-method get_internal_child
+ (of-object "GtkBuildable")
+ (c-name "gtk_buildable_get_internal_child")
+ (return-type "GObject*")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("const-gchar*" "childname")
+ )
+)
+
+(define-virtual set_name
+ (of-object "GtkBuildable")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "name")
+ )
+)
+
+(define-virtual get_name
+ (of-object "GtkBuildable")
+ (return-type "constgchar*")
+)
+
+(define-virtual add_child
+ (of-object "GtkBuildable")
+ (return-type "none")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("GObject*" "child")
+ '("const-gchar*" "type")
+ )
+)
+
+(define-virtual set_buildable_property
+ (of-object "GtkBuildable")
+ (return-type "none")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("const-gchar*" "name")
+ '("const-GValue*" "value")
+ )
+)
+
+(define-virtual construct_child
+ (of-object "GtkBuildable")
+ (return-type "GObject*")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("const-gchar*" "name")
+ )
+)
+
+(define-virtual custom_tag_start
+ (of-object "GtkBuildable")
+ (return-type "gboolean")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("GObject*" "child")
+ '("const-gchar*" "tagname")
+ '("GMarkupParser*" "parser")
+ '("gpointer*" "data")
+ )
+)
+
+(define-virtual custom_tag_end
+ (of-object "GtkBuildable")
+ (return-type "none")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("GObject*" "child")
+ '("const-gchar*" "tagname")
+ '("gpointer*" "data")
+ )
+)
+
+(define-virtual custom_finished
+ (of-object "GtkBuildable")
+ (return-type "none")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("GObject*" "child")
+ '("const-gchar*" "tagname")
+ '("gpointer" "data")
+ )
+)
+
+(define-virtual parser_finished
+ (of-object "GtkBuildable")
+ (return-type "none")
+ (parameters
+ '("GtkBuilder*" "builder")
+ )
+)
+
+(define-virtual get_internal_child
+ (of-object "GtkBuildable")
+ (return-type "GObject*")
+ (parameters
+ '("GtkBuilder*" "builder")
+ '("const-gchar*" "childname")
+ )
+)
+
+
+
+;; From gtkbuilder.h
+
+(define-function builder_error_quark
+ (c-name "gtk_builder_error_quark")
+ (return-type "GQuark")
+)
+
+(define-function gtk_builder_get_type
+ (c-name "gtk_builder_get_type")
+ (return-type "GType")
+)
+
+(define-function gtk_builder_new
+ (c-name "gtk_builder_new")
+ (is-constructor-of "GtkBuilder")
+ (return-type "GtkBuilder*")
+)
+
+(define-method add_from_file
+ (of-object "GtkBuilder")
+ (c-name "gtk_builder_add_from_file")
+ (return-type "guint")
+ (parameters
+ '("const-gchar*" "filename")
+ '("GError**" "error")
+ )
+)
+
+(define-method add_from_string
+ (of-object "GtkBuilder")
+ (c-name "gtk_builder_add_from_string")
+ (return-type "guint")
+ (parameters
+ '("const-gchar*" "buffer")
+ '("gsize" "length")
+ '("GError**" "error")
+ )
+)
+
+(define-method get_object
+ (of-object "GtkBuilder")
+ (c-name "gtk_builder_get_object")
+ (return-type "GObject*")
+ (parameters
+ '("const-gchar*" "name")
+ )
+)
+
+(define-method get_objects
+ (of-object "GtkBuilder")
+ (c-name "gtk_builder_get_objects")
+ (return-type "GSList*")
+)
+
+(define-method connect_signals
+ (of-object "GtkBuilder")
+ (c-name "gtk_builder_connect_signals")
+ (return-type "none")
+ (parameters
+ '("gpointer" "user_data")
+ )
+)
+
+(define-method connect_signals_full
+ (of-object "GtkBuilder")
+ (c-name "gtk_builder_connect_signals_full")
+ (return-type "none")
+ (parameters
+ '("GtkBuilderConnectFunc" "func")
+ '("gpointer" "user_data")
+ )
+)
+
+(define-method set_translation_domain
+ (of-object "GtkBuilder")
+ (c-name "gtk_builder_set_translation_domain")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "domain")
+ )
+)
+
+(define-method get_translation_domain
+ (of-object "GtkBuilder")
+ (c-name "gtk_builder_get_translation_domain")
+ (return-type "const-gchar*")
+)
+
+(define-method get_type_from_name
+ (of-object "GtkBuilder")
+ (c-name "gtk_builder_get_type_from_name")
+ (return-type "GType")
+ (parameters
+ '("const-char*" "type_name")
+ )
+)
+
+(define-method value_from_string
+ (of-object "GtkBuilder")
+ (c-name "gtk_builder_value_from_string")
+ (return-type "gboolean")
+ (parameters
+ '("GParamSpec*" "pspec")
+ '("const-gchar*" "string")
+ '("GValue*" "value")
+ '("GError**" "error")
+ )
+)
+
+(define-method value_from_string_type
+ (of-object "GtkBuilder")
+ (c-name "gtk_builder_value_from_string_type")
+ (return-type "gboolean")
+ (parameters
+ '("GType" "type")
+ '("const-gchar*" "string")
+ '("GValue*" "value")
+ '("GError**" "error")
+ )
+)
+
+(define-virtual get_type_from_name
+ (of-object "GtkBuilder")
+ (return-type "GType")
+ (parameters
+ '("const-char*" "type_name")
+ )
+)
+
+
+
+;; From gtkaboutdialog.h
+
+(define-method get_program_name
+ (of-object "GtkAboutDialog")
+ (c-name "gtk_about_dialog_get_program_name")
+ (return-type "const-gchar*")
+)
+
+(define-method set_program_name
+ (of-object "GtkAboutDialog")
+ (c-name "gtk_about_dialog_set_program_name")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "name")
+ )
+)
+
+
+
+;; From gtkaction.h
+
+(define-method create_menu
+ (of-object "GtkAction")
+ (c-name "gtk_action_create_menu")
+ (return-type "GtkWidget*")
+)
+
+
+
+;; From gtkcelllayout.h
+
+(define-method get_cells
+ (of-object "GtkCellLayout")
+ (c-name "gtk_cell_layout_get_cells")
+ (return-type "GList*")
+)
+
+
+
+;; From gtkentrycompletion.h
+
+(define-method get_completion_prefix
+ (of-object "GtkEntryCompletion")
+ (c-name "gtk_entry_completion_get_completion_prefix")
+ (return-type "const-gchar*")
+)
+
+(define-method set_inline_selection
+ (of-object "GtkEntryCompletion")
+ (c-name "gtk_entry_completion_set_inline_selection")
+ (return-type "none")
+ (parameters
+ '("gboolean" "inline_selection")
+ )
+)
+
+(define-method get_inline_selection
+ (of-object "GtkEntryCompletion")
+ (c-name "gtk_entry_completion_get_inline_selection")
+ (return-type "gboolean")
+)
+
+
+
+;; From gtkentry.h
+
+(define-method set_cursor_hadjustment
+ (of-object "GtkEntry")
+ (c-name "gtk_entry_set_cursor_hadjustment")
+ (return-type "none")
+ (parameters
+ '("GtkAdjustment*" "adjustment")
+ )
+)
+
+(define-method get_cursor_hadjustment
+ (of-object "GtkEntry")
+ (c-name "gtk_entry_get_cursor_hadjustment")
+ (return-type "GtkAdjustment*")
+)
+
+
+
+;; From gtkicontheme.h
+
+(define-method choose_icon
+ (of-object "GtkIconTheme")
+ (c-name "gtk_icon_theme_choose_icon")
+ (return-type "GtkIconInfo*")
+ (parameters
+ '("const-gchar*[]" "icon_names")
+ '("gint" "size")
+ '("GtkIconLookupFlags" "flags")
+ )
+)
+
+(define-method list_contexts
+ (of-object "GtkIconTheme")
+ (c-name "gtk_icon_theme_list_contexts")
+ (return-type "GList*")
+)
+
+
+
+;; From gtkliststore.h
+
+(define-method set_valuesv
+ (of-object "GtkListStore")
+ (c-name "gtk_list_store_set_valuesv")
+ (return-type "none")
+ (parameters
+ '("GtkTreeIter*" "iter")
+ '("gint*" "columns")
+ '("GValue*" "values")
+ '("gint" "n_values")
+ )
+)
+
+
+
+;; From gtknotebook.h
+
+(define-method set_group
+ (of-object "GtkNotebook")
+ (c-name "gtk_notebook_set_group")
+ (return-type "none")
+ (parameters
+ '("gpointer" "group")
+ )
+)
+
+(define-method get_group
+ (of-object "GtkNotebook")
+ (c-name "gtk_notebook_get_group")
+ (return-type "gpointer")
+)
+
+
+
+;; From gtkpagesetup.h
+
+(define-function gtk_page_setup_new_from_file
+ (c-name "gtk_page_setup_new_from_file")
+ (return-type "GtkPageSetup*")
+ (parameters
+ '("const-gchar*" "file_name")
+ '("GError**" "error")
+ )
+)
+
+(define-function gtk_page_setup_new_from_key_file
+ (c-name "gtk_page_setup_new_from_key_file")
+ (return-type "GtkPageSetup*")
+ (parameters
+ '("GKeyFile*" "key_file")
+ '("const-gchar*" "group_name")
+ '("GError**" "error")
+ )
+)
+
+(define-method to_file
+ (of-object "GtkPageSetup")
+ (c-name "gtk_page_setup_to_file")
+ (return-type "gboolean")
+ (parameters
+ '("const-char*" "file_name")
+ '("GError**" "error")
+ )
+)
+
+(define-method to_key_file
+ (of-object "GtkPageSetup")
+ (c-name "gtk_page_setup_to_key_file")
+ (return-type "none")
+ (parameters
+ '("GKeyFile*" "key_file")
+ '("const-gchar*" "group_name")
+ )
+)
+
+
+
+;; From gtkpapersize.h
+
+(define-function paper_size_get_paper_sizes
+ (c-name "gtk_paper_size_get_paper_sizes")
+ (return-type "GList*")
+ (parameters
+ '("gboolean" "include_custom")
+ )
+)
+
+(define-function gtk_paper_size_new_from_key_file
+ (c-name "gtk_paper_size_new_from_key_file")
+ (return-type "GtkPaperSize*")
+ (parameters
+ '("GKeyFile*" "key_file")
+ '("const-gchar*" "group_name")
+ '("GError**" "error")
+ )
+)
+
+(define-method to_key_file
+ (of-object "GtkPaperSize")
+ (c-name "gtk_paper_size_to_key_file")
+ (return-type "none")
+ (parameters
+ '("GKeyFile*" "key_file")
+ '("const-gchar*" "group_name")
+ )
+)
+
+
+
+;; From gtkprintsettings.h
+
+(define-function gtk_print_settings_new_from_file
+ (c-name "gtk_print_settings_new_from_file")
+ (return-type "GtkPrintSettings*")
+ (parameters
+ '("const-gchar*" "file_name")
+ '("GError**" "error")
+ )
+)
+
+(define-method to_file
+ (of-object "GtkPrintSettings")
+ (c-name "gtk_print_settings_to_file")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "file_name")
+ '("GError**" "error")
+ )
+)
+
+(define-function gtk_print_settings_new_from_key_file
+ (c-name "gtk_print_settings_new_from_key_file")
+ (return-type "GtkPrintSettings*")
+ (parameters
+ '("GKeyFile*" "key_file")
+ '("const-gchar*" "group_name")
+ '("GError**" "error")
+ )
+)
+
+(define-method to_key_file
+ (of-object "GtkPrintSettings")
+ (c-name "gtk_print_settings_to_key_file")
+ (return-type "none")
+ (parameters
+ '("GKeyFile*" "key_file")
+ '("const-gchar*" "group_name")
+ )
+)
+
+
+
+;; From gtkrange.h
+
+(define-method set_show_fill_level
+ (of-object "GtkRange")
+ (c-name "gtk_range_set_show_fill_level")
+ (return-type "none")
+ (parameters
+ '("gboolean" "show_fill_level")
+ )
+)
+
+(define-method get_show_fill_level
+ (of-object "GtkRange")
+ (c-name "gtk_range_get_show_fill_level")
+ (return-type "gboolean")
+)
+
+(define-method set_restrict_to_fill_level
+ (of-object "GtkRange")
+ (c-name "gtk_range_set_restrict_to_fill_level")
+ (return-type "none")
+ (parameters
+ '("gboolean" "restrict_to_fill_level")
+ )
+)
+
+(define-method get_restrict_to_fill_level
+ (of-object "GtkRange")
+ (c-name "gtk_range_get_restrict_to_fill_level")
+ (return-type "gboolean")
+)
+
+(define-method set_fill_level
+ (of-object "GtkRange")
+ (c-name "gtk_range_set_fill_level")
+ (return-type "none")
+ (parameters
+ '("gdouble" "fill_level")
+ )
+)
+
+(define-method get_fill_level
+ (of-object "GtkRange")
+ (c-name "gtk_range_get_fill_level")
+ (return-type "gdouble")
+)
+
+
+
+;; From gtkrc.h
+
+(define-function rc_parse_color_full
+ (c-name "gtk_rc_parse_color_full")
+ (return-type "guint")
+ (parameters
+ '("GScanner*" "scanner")
+ '("GtkRcStyle*" "style")
+ '("GdkColor*" "color")
+ )
+)
+
+
+
+;; From gtkrecentaction.h
+
+(define-function gtk_recent_action_get_type
+ (c-name "gtk_recent_action_get_type")
+ (return-type "GType")
+)
+
+(define-function gtk_recent_action_new
+ (c-name "gtk_recent_action_new")
+ (is-constructor-of "GtkRecentAction")
+ (return-type "GtkAction*")
+ (parameters
+ '("const-gchar*" "name")
+ '("const-gchar*" "label")
+ '("const-gchar*" "tooltip")
+ '("const-gchar*" "stock_id")
+ )
+)
+
+(define-function gtk_recent_action_new_for_manager
+ (c-name "gtk_recent_action_new_for_manager")
+ (return-type "GtkAction*")
+ (parameters
+ '("const-gchar*" "name")
+ '("const-gchar*" "label")
+ '("const-gchar*" "tooltip")
+ '("const-gchar*" "stock_id")
+ '("GtkRecentManager*" "manager")
+ )
+)
+
+(define-method get_show_numbers
+ (of-object "GtkRecentAction")
+ (c-name "gtk_recent_action_get_show_numbers")
+ (return-type "gboolean")
+)
+
+(define-method set_show_numbers
+ (of-object "GtkRecentAction")
+ (c-name "gtk_recent_action_set_show_numbers")
+ (return-type "none")
+ (parameters
+ '("gboolean" "show_numbers")
+ )
+)
+
+
+
+;; From gtkscalebutton.h
+
+(define-function gtk_scale_button_get_type
+ (c-name "gtk_scale_button_get_type")
+ (return-type "GType")
+)
+
+(define-function gtk_scale_button_new
+ (c-name "gtk_scale_button_new")
+ (is-constructor-of "GtkScaleButton")
+ (return-type "GtkWidget*")
+ (parameters
+ '("GtkIconSize" "size")
+ '("gdouble" "min")
+ '("gdouble" "max")
+ '("gdouble" "step")
+ '("const-gchar**" "icons")
+ )
+)
+
+(define-method set_icons
+ (of-object "GtkScaleButton")
+ (c-name "gtk_scale_button_set_icons")
+ (return-type "none")
+ (parameters
+ '("const-gchar**" "icons")
+ )
+)
+
+(define-method get_value
+ (of-object "GtkScaleButton")
+ (c-name "gtk_scale_button_get_value")
+ (return-type "gdouble")
+)
+
+(define-method set_value
+ (of-object "GtkScaleButton")
+ (c-name "gtk_scale_button_set_value")
+ (return-type "none")
+ (parameters
+ '("gdouble" "value")
+ )
+)
+
+(define-method get_adjustment
+ (of-object "GtkScaleButton")
+ (c-name "gtk_scale_button_get_adjustment")
+ (return-type "GtkAdjustment*")
+)
+
+(define-method set_adjustment
+ (of-object "GtkScaleButton")
+ (c-name "gtk_scale_button_set_adjustment")
+ (return-type "none")
+ (parameters
+ '("GtkAdjustment*" "adjustment")
+ )
+)
+
+
+
+;; From gtkstatusicon.h
+
+(define-method set_screen
+ (of-object "GtkStatusIcon")
+ (c-name "gtk_status_icon_set_screen")
+ (return-type "none")
+ (parameters
+ '("GdkScreen*" "screen")
+ )
+)
+
+(define-method get_screen
+ (of-object "GtkStatusIcon")
+ (c-name "gtk_status_icon_get_screen")
+ (return-type "GdkScreen*")
+)
+
+
+
+;; From gtktextbuffer.h
+
+(define-method add_mark
+ (of-object "GtkTextBuffer")
+ (c-name "gtk_text_buffer_add_mark")
+ (return-type "none")
+ (parameters
+ '("GtkTextMark*" "mark")
+ '("const-GtkTextIter*" "where")
+ )
+)
+
+
+
+;; From gtktextmark.h
+
+(define-function gtk_text_mark_new
+ (c-name "gtk_text_mark_new")
+ (is-constructor-of "GtkTextMark")
+ (return-type "GtkTextMark*")
+ (parameters
+ '("const-gchar*" "name")
+ '("gboolean" "left_gravity")
+ )
+)
+
+
+
+;; From gtktooltip.h
+
+(define-function gtk_tooltip_get_type
+ (c-name "gtk_tooltip_get_type")
+ (return-type "GType")
+)
+
+(define-method set_markup
+ (of-object "GtkTooltip")
+ (c-name "gtk_tooltip_set_markup")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "markup")
+ )
+)
+
+(define-method set_text
+ (of-object "GtkTooltip")
+ (c-name "gtk_tooltip_set_text")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "text")
+ )
+)
+
+(define-method set_icon
+ (of-object "GtkTooltip")
+ (c-name "gtk_tooltip_set_icon")
+ (return-type "none")
+ (parameters
+ '("GdkPixbuf*" "pixbuf")
+ )
+)
+
+(define-method set_icon_from_stock
+ (of-object "GtkTooltip")
+ (c-name "gtk_tooltip_set_icon_from_stock")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "stock_id")
+ '("GtkIconSize" "size")
+ )
+)
+
+(define-method set_custom
+ (of-object "GtkTooltip")
+ (c-name "gtk_tooltip_set_custom")
+ (return-type "none")
+ (parameters
+ '("GtkWidget*" "custom_widget")
+ )
+)
+
+(define-function tooltip_trigger_tooltip_query
+ (c-name "gtk_tooltip_trigger_tooltip_query")
+ (return-type "none")
+ (parameters
+ '("GdkDisplay*" "display")
+ )
+)
+
+
+
+;; From gtktreestore.h
+
+(define-method set_valuesv
+ (of-object "GtkTreeStore")
+ (c-name "gtk_tree_store_set_valuesv")
+ (return-type "none")
+ (parameters
+ '("GtkTreeIter*" "iter")
+ '("gint*" "columns")
+ '("GValue*" "values")
+ '("gint" "n_values")
+ )
+)
+
+
+
+;; From gtktreeviewcolumn.h
+
+(define-method get_tree_view
+ (of-object "GtkTreeViewColumn")
+ (c-name "gtk_tree_view_column_get_tree_view")
+ (return-type "GtkWidget*")
+)
+
+
+
+;; From gtktreeview.h
+
+(define-method convert_widget_to_tree_coords
+ (of-object "GtkTreeView")
+ (c-name "gtk_tree_view_convert_widget_to_tree_coords")
+ (return-type "none")
+ (parameters
+ '("gint" "wx")
+ '("gint" "wy")
+ '("gint*" "tx")
+ '("gint*" "ty")
+ )
+)
+
+(define-method convert_tree_to_widget_coords
+ (of-object "GtkTreeView")
+ (c-name "gtk_tree_view_convert_tree_to_widget_coords")
+ (return-type "none")
+ (parameters
+ '("gint" "tx")
+ '("gint" "ty")
+ '("gint*" "wx")
+ '("gint*" "wy")
+ )
+)
+
+(define-method convert_widget_to_bin_window_coords
+ (of-object "GtkTreeView")
+ (c-name "gtk_tree_view_convert_widget_to_bin_window_coords")
+ (return-type "none")
+ (parameters
+ '("gint" "wx")
+ '("gint" "wy")
+ '("gint*" "bx")
+ '("gint*" "by")
+ )
+)
+
+(define-method convert_bin_window_to_widget_coords
+ (of-object "GtkTreeView")
+ (c-name "gtk_tree_view_convert_bin_window_to_widget_coords")
+ (return-type "none")
+ (parameters
+ '("gint" "bx")
+ '("gint" "by")
+ '("gint*" "wx")
+ '("gint*" "wy")
+ )
+)
+
+(define-method convert_tree_to_bin_window_coords
+ (of-object "GtkTreeView")
+ (c-name "gtk_tree_view_convert_tree_to_bin_window_coords")
+ (return-type "none")
+ (parameters
+ '("gint" "tx")
+ '("gint" "ty")
+ '("gint*" "bx")
+ '("gint*" "by")
+ )
+)
+
+(define-method convert_bin_window_to_tree_coords
+ (of-object "GtkTreeView")
+ (c-name "gtk_tree_view_convert_bin_window_to_tree_coords")
+ (return-type "none")
+ (parameters
+ '("gint" "bx")
+ '("gint" "by")
+ '("gint*" "tx")
+ '("gint*" "ty")
+ )
+)
+
+(define-method set_show_expanders
+ (of-object "GtkTreeView")
+ (c-name "gtk_tree_view_set_show_expanders")
+ (return-type "none")
+ (parameters
+ '("gboolean" "enabled")
+ )
+)
+
+(define-method get_show_expanders
+ (of-object "GtkTreeView")
+ (c-name "gtk_tree_view_get_show_expanders")
+ (return-type "gboolean")
+)
+
+(define-method set_level_indentation
+ (of-object "GtkTreeView")
+ (c-name "gtk_tree_view_set_level_indentation")
+ (return-type "none")
+ (parameters
+ '("gint" "indentation")
+ )
+)
+
+(define-method get_level_indentation
+ (of-object "GtkTreeView")
+ (c-name "gtk_tree_view_get_level_indentation")
+ (return-type "gint")
+)
+
+
+
+;; From gtkvolumebutton.h
+
+(define-function gtk_volume_button_get_type
+ (c-name "gtk_volume_button_get_type")
+ (return-type "GType")
+)
+
+(define-function gtk_volume_button_new
+ (c-name "gtk_volume_button_new")
+ (is-constructor-of "GtkVolumeButton")
+ (return-type "GtkWidget*")
+)
+
+
+
+;; From gtkwidget.h
+
+(define-method keynav_failed
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_keynav_failed")
+ (return-type "gboolean")
+ (parameters
+ '("GtkDirectionType" "direction")
+ )
+)
+
+(define-method error_bell
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_error_bell")
+ (return-type "none")
+)
+
+(define-method set_tooltip_window
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_set_tooltip_window")
+ (return-type "none")
+ (parameters
+ '("GtkWindow*" "custom_window")
+ )
+)
+
+(define-method get_tooltip_window
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_get_tooltip_window")
+ (return-type "GtkWindow*")
+)
+
+(define-method trigger_tooltip_query
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_trigger_tooltip_query")
+ (return-type "none")
+)
+
+(define-method set_tooltip_text
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_set_tooltip_text")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "text")
+ )
+)
+
+(define-method get_tooltip_text
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_get_tooltip_text")
+ (return-type "gchar*")
+)
+
+(define-method set_tooltip_markup
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_set_tooltip_markup")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "markup")
+ )
+)
+
+(define-method get_tooltip_markup
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_get_tooltip_markup")
+ (return-type "gchar*")
+)
+
+(define-method modify_cursor
+ (of-object "GtkWidget")
+ (c-name "gtk_widget_modify_cursor")
+ (return-type "none")
+ (parameters
+ '("const-GdkColor*" "primary")
+ '("const-GdkColor*" "secondary")
+ )
+)
+
+
+
+;; From gtkwindow.h
+
+(define-method set_opacity
+ (of-object "GtkWindow")
+ (c-name "gtk_window_set_opacity")
+ (return-type "none")
+ (parameters
+ '("gdouble" "opacity")
+ )
+)
+
+(define-method get_opacity
+ (of-object "GtkWindow")
+ (c-name "gtk_window_get_opacity")
+ (return-type "gdouble")
+)
+
+(define-method set_startup_id
+ (of-object "GtkWindow")
+ (c-name "gtk_window_set_startup_id")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "startup_id")
+ )
+)
diff --git a/gtk/gtkunixprint.defs b/gtk/gtkunixprint.defs
index 57581caa..57a381f0 100644
--- a/gtk/gtkunixprint.defs
+++ b/gtk/gtkunixprint.defs
@@ -194,6 +194,30 @@
)
)
+(define-method get_capabilities
+ (of-object "GtkPrinter")
+ (c-name "gtk_printer_get_capabilities")
+ (return-type "GtkPrintCapabilities")
+)
+
+(define-method has_details
+ (of-object "GtkPrinter")
+ (c-name "gtk_printer_has_details")
+ (return-type "gboolean")
+)
+
+(define-method list_papers
+ (of-object "GtkPrinter")
+ (c-name "gtk_printer_list_papers")
+ (return-type "GList*")
+)
+
+(define-method request_details
+ (of-object "GtkPrinter")
+ (c-name "gtk_printer_request_details")
+ (return-type "none")
+)
+
(define-function enumerate_printers
(c-name "gtk_enumerate_printers")
(return-type "none")
diff --git a/pango-types.defs b/pango-types.defs
index 2f9e734a..896bdb3d 100644
--- a/pango-types.defs
+++ b/pango-types.defs
@@ -279,6 +279,30 @@
)
)
+(define-enum Gravity
+ (in-module "Pango")
+ (c-name "PangoGravity")
+ (gtype-id "PANGO_TYPE_GRAVITY")
+ (values
+ '("south" "PANGO_GRAVITY_SOUTH")
+ '("east" "PANGO_GRAVITY_EAST")
+ '("north" "PANGO_GRAVITY_NORTH")
+ '("west" "PANGO_GRAVITY_WEST")
+ '("auto" "PANGO_GRAVITY_AUTO")
+ )
+)
+
+(define-enum GravityHint
+ (in-module "Pango")
+ (c-name "PangoGravityHint")
+ (gtype-id "PANGO_TYPE_GRAVITY_HINT")
+ (values
+ '("natural" "PANGO_GRAVITY_HINT_NATURAL")
+ '("strong" "PANGO_GRAVITY_HINT_STRONG")
+ '("line" "PANGO_GRAVITY_HINT_LINE")
+ )
+)
+
(define-enum RenderPart
(in-module "Pango")
(c-name "PangoRenderPart")
diff --git a/pango.defs b/pango.defs
index 1b91550d..d7185e57 100644
--- a/pango.defs
+++ b/pango.defs
@@ -30,6 +30,12 @@
)
)
+(define-method to_string
+ (of-object "PangoColor")
+ (c-name "pango_color_to_string")
+ (return-type "gchar*")
+)
+
(define-function pango_attr_type_register
(c-name "pango_attr_type_register")
(return-type "PangoAttrType")
@@ -240,6 +246,24 @@
)
)
+(define-function attr_gravity_new
+ (c-name "pango_attr_gravity_new")
+ (is-constructor-of "PangoAttrGravity")
+ (return-type "PangoAttribute*")
+ (parameters
+ '("PangoGravity" "gravity")
+ )
+)
+
+(define-function attr_gravity_hint_new
+ (c-name "pango_attr_gravity_hint_new")
+ (is-constructor-of "PangoAttrGravityHint")
+ (return-type "PangoAttribute*")
+ (parameters
+ '("PangoGravityHint" "hint")
+ )
+)
+
(define-function pango_attr_list_get_type
(c-name "pango_attr_list_get_type")
(return-type "GType")
@@ -589,6 +613,42 @@
(return-type "const-PangoMatrix*")
)
+(define-method set_base_gravity
+ (of-object "PangoContext")
+ (c-name "pango_context_set_base_gravity")
+ (return-type "none")
+ (parameters
+ '("PangoGravity" "gravity")
+ )
+)
+
+(define-method get_base_gravity
+ (of-object "PangoContext")
+ (c-name "pango_context_get_base_gravity")
+ (return-type "PangoGravity")
+)
+
+(define-method get_gravity
+ (of-object "PangoContext")
+ (c-name "pango_context_get_gravity")
+ (return-type "PangoGravity")
+)
+
+(define-method set_gravity_hint
+ (of-object "PangoContext")
+ (c-name "pango_context_set_gravity_hint")
+ (return-type "none")
+ (parameters
+ '("PangoGravityHint" "hint")
+ )
+)
+
+(define-method get_gravity_hint
+ (of-object "PangoContext")
+ (c-name "pango_context_get_gravity_hint")
+ (return-type "PangoGravityHint")
+)
+
(define-function itemize
(c-name "pango_itemize")
(return-type "GList*")
@@ -998,6 +1058,21 @@
(return-type "gboolean")
)
+(define-method set_gravity
+ (of-object "PangoFontDescription")
+ (c-name "pango_font_description_set_gravity")
+ (return-type "none")
+ (parameters
+ '("PangoGravity" "gravity")
+ )
+)
+
+(define-method get_gravity
+ (of-object "PangoFontDescription")
+ (c-name "pango_font_description_get_gravity")
+ (return-type "PangoGravity")
+)
+
(define-method get_set_fields
(of-object "PangoFontDescription")
(c-name "pango_font_description_get_set_fields")
@@ -1499,6 +1574,36 @@
+;; From pango-gravity.h
+
+(define-function gravity_to_rotation
+ (c-name "pango_gravity_to_rotation")
+ (return-type "double")
+ (parameters
+ '("PangoGravity" "gravity")
+ )
+)
+
+(define-function gravity_get_for_matrix
+ (c-name "pango_gravity_get_for_matrix")
+ (return-type "PangoGravity")
+ (parameters
+ '("const-PangoMatrix*" "matrix")
+ )
+)
+
+(define-function gravity_get_for_script
+ (c-name "pango_gravity_get_for_script")
+ (return-type "PangoGravity")
+ (parameters
+ '("PangoScript" "script")
+ '("PangoGravity" "base_gravity")
+ '("PangoGravityHint" "hint")
+ )
+)
+
+
+
;; From pango-glyph-item.h
(define-method split
@@ -1822,6 +1927,12 @@
(return-type "PangoWrapMode")
)
+(define-method is_wrapped
+ (of-object "PangoLayout")
+ (c-name "pango_layout_is_wrapped")
+ (return-type "gboolean")
+)
+
(define-method set_indent
(of-object "PangoLayout")
(c-name "pango_layout_set_indent")
@@ -1942,6 +2053,18 @@
(return-type "PangoEllipsizeMode")
)
+(define-method is_ellipsized
+ (of-object "PangoLayout")
+ (c-name "pango_layout_is_ellipsized")
+ (return-type "gboolean")
+)
+
+(define-method get_unknown_glyphs_count
+ (of-object "PangoLayout")
+ (c-name "pango_layout_get_unknown_glyphs_count")
+ (return-type "int")
+)
+
(define-method context_changed
(of-object "PangoLayout")
(c-name "pango_layout_context_changed")
@@ -2060,12 +2183,27 @@
)
)
+(define-method get_line_readonly
+ (of-object "PangoLayout")
+ (c-name "pango_layout_get_line_readonly")
+ (return-type "PangoLayoutLine*")
+ (parameters
+ '("int" "line")
+ )
+)
+
(define-method get_lines
(of-object "PangoLayout")
(c-name "pango_layout_get_lines")
(return-type "GSList*")
)
+(define-method get_lines_readonly
+ (of-object "PangoLayout")
+ (c-name "pango_layout_get_lines_readonly")
+ (return-type "GSList*")
+)
+
(define-function layout_line_get_type
(c-name "pango_layout_line_get_type")
(return-type "GType")
@@ -2166,12 +2304,24 @@
(return-type "PangoLayoutRun*")
)
+(define-method get_run_readonly
+ (of-object "PangoLayoutIter")
+ (c-name "pango_layout_iter_get_run_readonly")
+ (return-type "PangoLayoutRun*")
+)
+
(define-method get_line
(of-object "PangoLayoutIter")
(c-name "pango_layout_iter_get_line")
(return-type "PangoLayoutLine*")
)
+(define-method get_line_readonly
+ (of-object "PangoLayoutIter")
+ (c-name "pango_layout_iter_get_line_readonly")
+ (return-type "PangoLayoutLine*")
+)
+
(define-method at_last_line
(of-object "PangoLayoutIter")
(c-name "pango_layout_iter_at_last_line")
@@ -2772,6 +2922,44 @@
)
)
+(define-method transform_point
+ (of-object "PangoMatrix")
+ (c-name "pango_matrix_transform_point")
+ (return-type "none")
+ (parameters
+ '("double*" "x")
+ '("double*" "y")
+ )
+)
+
+(define-method transform_distance
+ (of-object "PangoMatrix")
+ (c-name "pango_matrix_transform_distance")
+ (return-type "none")
+ (parameters
+ '("double*" "dx")
+ '("double*" "dy")
+ )
+)
+
+(define-method transform_rectangle
+ (of-object "PangoMatrix")
+ (c-name "pango_matrix_transform_rectangle")
+ (return-type "none")
+ (parameters
+ '("PangoRectangle*" "rect")
+ )
+)
+
+(define-method transform_pixel_rectangle
+ (of-object "PangoMatrix")
+ (c-name "pango_matrix_transform_pixel_rectangle")
+ (return-type "none")
+ (parameters
+ '("PangoRectangle*" "rect")
+ )
+)
+
(define-function language_get_type
(c-name "pango_language_get_type")
(return-type "GType")
@@ -2847,6 +3035,30 @@
)
)
+(define-function extents_to_pixels
+ (c-name "pango_extents_to_pixels")
+ (return-type "none")
+ (parameters
+ '("PangoRectangle*" "ink_rect")
+ '("PangoRectangle*" "logical_rect")
+ )
+)
+
+(define-function units_from_double
+ (c-name "pango_units_from_double")
+ (return-type "int")
+ (parameters
+ '("double" "d")
+ )
+)
+
+(define-function units_to_double
+ (c-name "pango_units_to_double")
+ (return-type "double")
+ (parameters
+ '("int" "i")
+ )
+)
;;
@@ -2974,6 +3186,18 @@
)
)
+(define-function parse_enum
+ (c-name "pango_parse_enum")
+ (return-type "gboolean")
+ (parameters
+ '("GType" "type")
+ '("const-char*" "str")
+ '("int*" "value")
+ '("gboolean" "warn")
+ '("char**" "possible_values")
+ )
+)
+
(define-function parse_style
(c-name "pango_parse_style")
(return-type "gboolean")
@@ -3040,6 +3264,11 @@
(return-type "const-char*")
)
+(define-function language_get_default
+ (c-name "pango_language_get_default")
+ (return-type "PangoLanguage*")
+)
+
(define-function is_zero_width
(c-name "pango_is_zero_width")
(return-type "gboolean")
@@ -3049,5 +3278,24 @@
)
) ;; USE_PANGO_UTILS
+(define-function version
+ (c-name "pango_version")
+ (return-type "int")
+)
+
+(define-function version_string
+ (c-name "pango_version_string")
+ (return-type "const-char*")
+)
+
+(define-function version_check
+ (c-name "pango_version_check")
+ (return-type "const-char*")
+ (parameters
+ '("int" "required_major")
+ '("int" "required_minor")
+ '("int" "required_micro")
+ )
+)
diff --git a/pangocairo.defs b/pangocairo.defs
index 207ef8a1..eb7d079a 100644
--- a/pangocairo.defs
+++ b/pangocairo.defs
@@ -159,4 +159,26 @@
)
)
+(define-function error_underline_path
+ (c-name "pango_cairo_error_underline_path")
+ (return-type "none")
+ (parameters
+ '("cairo_t*" "cr")
+ '("double" "x")
+ '("double" "y")
+ '("double" "width")
+ '("double" "height")
+ )
+)
+(define-function show_error_underline
+ (c-name "pango_cairo_show_error_underline")
+ (return-type "none")
+ (parameters
+ '("cairo_t*" "cr")
+ '("double" "x")
+ '("double" "y")
+ '("double" "width")
+ '("double" "height")
+ )
+)