diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | gtk/Makefile.am | 7 | ||||
| -rw-r--r-- | gtk/gdk-types.defs | 7 | ||||
| -rw-r--r-- | gtk/gdk.defs | 163 | ||||
| -rw-r--r-- | gtk/gdk.override | 64 | ||||
| -rw-r--r-- | gtk/gtk.defs | 382 | ||||
| -rw-r--r-- | pango-types.defs | 19 | ||||
| -rw-r--r-- | pango.defs | 149 | ||||
| -rw-r--r-- | tests/common.py | 2 | ||||
| -rw-r--r-- | tests/runtests.py | 2 | ||||
| -rw-r--r-- | tests/test_radiobutton.py | 3 |
12 files changed, 810 insertions, 7 deletions
@@ -1,5 +1,18 @@ 2005-07-08 Johan Dahlin <jdahlin@async.com.br> + * configure.in: + * gtk/Makefile.am: + * gtk/gdk-types.defs: + * gtk/gdk.defs: + * gtk/gdk.override: + * gtk/gtk.defs: + * pango-types.defs: + * pango.defs: + Merge new Gdk & Gtk API. pango.Renderer and functions/methods also + added. Bump required glib,gtk & pango versions. + +2005-07-08 Johan Dahlin <jdahlin@async.com.br> + * gobject/gobjectmodule.c: (initgobject): * gobject/pygobject-private.h: * gobject/pygobject.c: (pyg_props_iter_dealloc), diff --git a/configure.in b/configure.in index f618e99b..332b542b 100644 --- a/configure.in +++ b/configure.in @@ -8,10 +8,10 @@ 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.6.0) -m4_define(pango_required_version, 1.8.0) +m4_define(glib_required_version, 2.7.0) +m4_define(pango_required_version, 1.9.0) m4_define(atk_required_version, 1.8.0) -m4_define(gtk_required_version, 2.6.0) +m4_define(gtk_required_version, 2.7.0) m4_define(libglade_required_version, 2.4.0) m4_define(pycairo_required_version, 0.5.0) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index e0421361..52841d95 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -19,8 +19,11 @@ pkgincludedir = $(includedir)/pygtk-$(PLATFORM_VERSION)/pygtk pkginclude_HEADERS = pygtk.h INCLUDES = -I$(top_srcdir)/gobject $(PYTHON_INCLUDES) -COMMONDEFS = $(srcdir)/gtk-types.defs $(srcdir)/gdk-types.defs \ - $(top_srcdir)/atk-types.defs $(top_srcdir)/pango-types.defs +COMMONDEFS = \ + $(srcdir)/gtk-types.defs \ + $(srcdir)/gdk-types.defs \ + $(top_srcdir)/atk-types.defs \ + $(top_srcdir)/pango-types.defs common_ldflags = -module -avoid-version if PLATFORM_WIN32 diff --git a/gtk/gdk-types.defs b/gtk/gdk-types.defs index 4bc22820..1e6ba5ae 100644 --- a/gtk/gdk-types.defs +++ b/gtk/gdk-types.defs @@ -74,6 +74,13 @@ (gtype-id "GDK_TYPE_WINDOW") ) +(define-object PangoRenderer + (in-module "Gdk") + (parent "PangoRenderer") + (c-name "GdkPangoRenderer") + (gtype-id "GDK_TYPE_PANGO_RENDERER") +) + (define-object Pixmap (in-module "Gdk") (parent "GdkDrawable") diff --git a/gtk/gdk.defs b/gtk/gdk.defs index ff7bbd89..0446f558 100644 --- a/gtk/gdk.defs +++ b/gtk/gdk.defs @@ -490,6 +490,18 @@ (return-type "GdkDisplay*") ) +(define-method store_clipboard + (of-object "GdkDisplay") + (c-name "gdk_display_store_clipboard") + (return-type "none") + (parameters + '("GdkWindow*" "clipboard_window") + '("guint32" "time_") + '("GdkAtom*" "targets") + '("gint" "n_targets") + ) +) + (define-method supports_selection_notification (of-object "GdkDisplay") (c-name "gdk_display_supports_selection_notification") @@ -1109,6 +1121,30 @@ ) ) +(define-function gdk_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-function gdk_draw_trapezoids + (c-name "gdk_draw_trapezoids") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("GdkTrapezoid*" "trapezoids") + '("gint" "n_trapezoids") + ) +) (define-method get_image (of-object "GdkDrawable") (c-name "gdk_drawable_get_image") @@ -2109,6 +2145,133 @@ +;; From /home/jdahlin/dev/gtk-2.8/gtk+/gdk/gdkpango.h + +(define-function gdk_pango_renderer_get_type + (c-name "gdk_pango_renderer_get_type") + (return-type "GType") +) + +(define-function gdk_pango_renderer_new + (c-name "gdk_pango_renderer_new") + (is-constructor-of "GdkPangoRenderer") + (return-type "PangoRenderer*") + (parameters + '("GdkScreen*" "screen") + ) +) + +(define-function gdk_pango_renderer_get_default + (c-name "gdk_pango_renderer_get_default") + (return-type "PangoRenderer*") + (parameters + '("GdkScreen*" "screen") + ) +) + +(define-method set_drawable + (of-object "GdkPangoRenderer") + (c-name "gdk_pango_renderer_set_drawable") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + ) +) + +(define-method set_gc + (of-object "GdkPangoRenderer") + (c-name "gdk_pango_renderer_set_gc") + (return-type "none") + (parameters + '("GdkGC*" "gc") + ) +) + +(define-method set_stipple + (of-object "GdkPangoRenderer") + (c-name "gdk_pango_renderer_set_stipple") + (return-type "none") + (parameters + '("PangoRenderPart" "part") + '("GdkBitmap*" "stipple") + ) +) + +(define-method set_override_color + (of-object "GdkPangoRenderer") + (c-name "gdk_pango_renderer_set_override_color") + (return-type "none") + (parameters + '("PangoRenderPart" "part") + '("const-GdkColor*" "color") + ) +) + +(define-function gdk_pango_context_get_for_screen + (c-name "gdk_pango_context_get_for_screen") + (return-type "PangoContext*") + (parameters + '("GdkScreen*" "screen") + ) +) + +(define-function gdk_pango_context_get + (c-name "gdk_pango_context_get") + (return-type "PangoContext*") +) + +(define-function gdk_pango_context_set_colormap + (c-name "gdk_pango_context_set_colormap") + (return-type "none") + (parameters + '("PangoContext*" "context") + '("GdkColormap*" "colormap") + ) +) + +(define-function gdk_pango_layout_line_get_clip_region + (c-name "gdk_pango_layout_line_get_clip_region") + (return-type "GdkRegion*") + (parameters + '("PangoLayoutLine*" "line") + '("gint" "x_origin") + '("gint" "y_origin") + '("gint*" "index_ranges") + '("gint" "n_ranges") + ) +) + +(define-function gdk_pango_layout_get_clip_region + (c-name "gdk_pango_layout_get_clip_region") + (return-type "GdkRegion*") + (parameters + '("PangoLayout*" "layout") + '("gint" "x_origin") + '("gint" "y_origin") + '("gint*" "index_ranges") + '("gint" "n_ranges") + ) +) + +(define-function gdk_pango_attr_stipple_new + (c-name "gdk_pango_attr_stipple_new") + (is-constructor-of "GdkPangoAttrStipple") + (return-type "PangoAttribute*") + (parameters + '("GdkBitmap*" "stipple") + ) +) + +(define-function gdk_pango_attr_embossed_new + (c-name "gdk_pango_attr_embossed_new") + (is-constructor-of "GdkPangoAttrEmbossed") + (return-type "PangoAttribute*") + (parameters + '("gboolean" "embossed") + ) +) + + ;; From /opt/gtk2/include/gtk-2.0/gdk/gdkpixbuf.h (define-method render_to_drawable diff --git a/gtk/gdk.override b/gtk/gdk.override index 3045fd22..e4abb688 100644 --- a/gtk/gdk.override +++ b/gtk/gdk.override @@ -65,6 +65,7 @@ import gobject.GObject as PyGObject_Type import pango.Context as PyPangoContext_Type import pango.Font as PyPangoFont_Type import pango.Layout as PyPangoLayout_Type +import pango.Renderer as PyPangoRenderer_Type %% ignore-glob *_get_type @@ -1233,6 +1234,36 @@ _wrap_gdk_event_tp_setattr(PyObject *self, char *attr, PyObject *value) return 0; } break; + case GDK_OWNER_CHANGE: + if (!strcmp(attr, "owner")) { + INT_CHECK(); + event->owner_change.owner = PyInt_AsLong(value); + } else if (!strcmp(attr, "reason")) { + INT_CHECK(); + event->owner_change.reason = PyInt_AsLong(value); + } else if (!strcmp(attr, "selection")) { + PyErr_SetString(PyExc_TypeError, "selection is not writable"); + return -1; + } else if (!strcmp(attr, "time")) { + INT_CHECK(); + event->owner_change.time = PyInt_AsLong(value); + } else if (!strcmp(attr, "selection_time")) { + INT_CHECK(); + event->owner_change.selection_time = PyInt_AsLong(value); + } + break; + case GDK_GRAB_BROKEN: + if (!strcmp(attr, "keyboard")) { + INT_CHECK(); + event->grab_broken.keyboard = PyInt_AsLong(value); + } else if (!strcmp(attr, "implicit")) { + INT_CHECK(); + event->grab_broken.keyboard = PyInt_AsLong(value); + } else if (!strcmp(attr, "grab_window")) { + PyErr_SetString(PyExc_TypeError, "grab_window is not writable"); + return -1; + } + break; default: break; } @@ -1553,6 +1584,39 @@ _wrap_gdk_event_tp_getattr(PyObject *self, char *attr) if (!strcmp(attr, "name")) return PyString_FromString(event->setting.name); break; + /* New in 2.8 */ + case GDK_OWNER_CHANGE: + if (!strcmp(attr, "__members__")) + return Py_BuildValue("[sssssss]", + "type", "window", "send_event", + "owner", "reason", "time", "selection_time"); + if (!strcmp(attr, "owner")) + return PyInt_FromLong(event->owner_change.owner); + if (!strcmp(attr, "reason")) + return pyg_enum_from_gtype(GDK_TYPE_OWNER_CHANGE, + event->owner_change.reason); + if (!strcmp(attr, "selection")) + return PyString_FromString( + gdk_atom_name(event->owner_change.selection)); + if (!strcmp(attr, "time")) + return PyInt_FromLong(event->owner_change.time); + if (!strcmp(attr, "selection_time")) + return PyInt_FromLong(event->owner_change.selection_time); + break; + case GDK_GRAB_BROKEN: + if (!strcmp(attr, "__members__")) + return Py_BuildValue("[ssssss]", + "type", "window", "send_event", + "keyboard", "implicit", + "grab_window"); + if (!strcmp(attr, "keyboard")) + return PyBool_FromLong(event->grab_broken.keyboard); + if (!strcmp(attr, "implicit")) + return PyBool_FromLong(event->grab_broken.implicit); + if (!strcmp(attr, "grab_window")) + return pygobject_new((GObject *)event->grab_broken.grab_window); + break; + default: break; } diff --git a/gtk/gtk.defs b/gtk/gtk.defs index 3b606ad0..24025b36 100644 --- a/gtk/gtk.defs +++ b/gtk/gtk.defs @@ -93,6 +93,21 @@ ) ) +(define-method get_wrap_license + (of-object "GtkAboutDialog") + (c-name "gtk_about_dialog_get_wrap_license") + (return-type "gboolean") +) + +(define-method set_wrap_license + (of-object "GtkAboutDialog") + (c-name "gtk_about_dialog_set_wrap_license") + (return-type "none") + (parameters + '("gboolean" "wrap_license") + ) +) + (define-method get_website (of-object "GtkAboutDialog") (c-name "gtk_about_dialog_get_website") @@ -368,6 +383,14 @@ ) ) +(define-function gtk_accel_group_from_accel_closure + (c-name "gtk_accel_group_from_accel_closure") + (return-type "GtkAccelGroup*") + (parameters + '("GClosure*" "closure") + ) +) + (define-function accelerator_valid (c-name "gtk_accelerator_valid") (return-type "gboolean") @@ -5370,6 +5393,15 @@ ) ) +(define-method get_response_for_widget + (of-object "GtkDialog") + (c-name "gtk_dialog_get_response_for_widget") + (return-type "gint") + (parameters + '("GtkWidget*" "widget") + ) +) + (define-method set_has_separator (of-object "GtkDialog") (c-name "gtk_dialog_set_has_separator") @@ -5653,6 +5685,22 @@ ) ) +(define-function drag_get_source_widget + (c-name "gtk_drag_get_source_widget") + (return-type "GtkWidget*") + (parameters + '("GdkDragContext*" "context") + ) +) + +(define-function drag_source_set_icon_name + (c-name "gtk_drag_source_set_icon_name") + (return-type "none") + (parameters + '("GtkWidget*" "widget") + '("const-gchar*" "icon_name") + ) +) ;; From /opt/gtk2/include/gtk-2.0/gtk/gtkdrawingarea.h @@ -6284,6 +6332,36 @@ (return-type "gboolean") ) +(define-method set_popup_set_width + (of-object "GtkEntryCompletion") + (c-name "gtk_entry_completion_set_popup_set_width") + (return-type "none") + (parameters + '("gboolean" "popup_set_width") + ) +) + +(define-method get_popup_set_width + (of-object "GtkEntryCompletion") + (c-name "gtk_entry_completion_get_popup_set_width") + (return-type "gboolean") +) + +(define-method set_popup_single_match + (of-object "GtkEntryCompletion") + (c-name "gtk_entry_completion_set_popup_single_match") + (return-type "none") + (parameters + '("gboolean" "popup_single_match") + ) +) + +(define-method get_popup_single_match + (of-object "GtkEntryCompletion") + (c-name "gtk_entry_completion_get_popup_single_match") + (return-type "gboolean") +) + (define-virtual match_selected (of-object "GtkEntryCompletion") (return-type "gboolean") @@ -9037,6 +9115,28 @@ ) ) +(define-method get_item_at_pos + (of-object "GtkIconView") + (c-name "gtk_icon_view_get_item_at_pos") + (return-type "gboolean") + (parameters + '("gint" "x") + '("gint" "y") + '("GtkTreePath**" "path") + '("GtkCellRenderer**" "cell") + ) +) + +(define-method get_visible_range + (of-object "GtkIconView") + (c-name "gtk_icon_view_get_visible_range") + (return-type "gboolean") + (parameters + '("GtkTreePath**" "start_path") + '("GtkTreePath**" "end_path") + ) +) + (define-method selected_foreach (of-object "GtkIconView") (c-name "gtk_icon_view_selected_foreach") @@ -9164,6 +9264,130 @@ (return-type "gboolean") ) +(define-method set_cursor + (of-object "GtkIconView") + (c-name "gtk_icon_view_set_cursor") + (return-type "none") + (parameters + '("GtkTreePath*" "path") + '("GtkCellRenderer*" "cell") + '("gboolean" "start_editing") + ) +) + +(define-method get_cursor + (of-object "GtkIconView") + (c-name "gtk_icon_view_get_cursor") + (return-type "gboolean") + (parameters + '("GtkTreePath**" "path") + '("GtkCellRenderer**" "cell") + ) +) + +(define-method scroll_to_path + (of-object "GtkIconView") + (c-name "gtk_icon_view_scroll_to_path") + (return-type "none") + (parameters + '("GtkTreePath*" "path") + '("gboolean" "use_align") + '("gfloat" "row_align") + '("gfloat" "col_align") + ) +) + +(define-method enable_model_drag_source + (of-object "GtkIconView") + (c-name "gtk_icon_view_enable_model_drag_source") + (return-type "none") + (parameters + '("GdkModifierType" "start_button_mask") + '("const-GtkTargetEntry*" "targets") + '("gint" "n_targets") + '("GdkDragAction" "actions") + ) +) + +(define-method enable_model_drag_dest + (of-object "GtkIconView") + (c-name "gtk_icon_view_enable_model_drag_dest") + (return-type "none") + (parameters + '("const-GtkTargetEntry*" "targets") + '("gint" "n_targets") + '("GdkDragAction" "actions") + ) +) + +(define-method unset_model_drag_source + (of-object "GtkIconView") + (c-name "gtk_icon_view_unset_model_drag_source") + (return-type "none") +) + +(define-method unset_model_drag_dest + (of-object "GtkIconView") + (c-name "gtk_icon_view_unset_model_drag_dest") + (return-type "none") +) + +(define-method set_reorderable + (of-object "GtkIconView") + (c-name "gtk_icon_view_set_reorderable") + (return-type "none") + (parameters + '("gboolean" "reorderable") + ) +) + +(define-method get_reorderable + (of-object "GtkIconView") + (c-name "gtk_icon_view_get_reorderable") + (return-type "gboolean") +) + +(define-method set_drag_dest_item + (of-object "GtkIconView") + (c-name "gtk_icon_view_set_drag_dest_item") + (return-type "none") + (parameters + '("GtkTreePath*" "path") + '("GtkIconViewDropPosition" "pos") + ) +) + +(define-method get_drag_dest_item + (of-object "GtkIconView") + (c-name "gtk_icon_view_get_drag_dest_item") + (return-type "none") + (parameters + '("GtkTreePath**" "path") + '("GtkIconViewDropPosition*" "pos") + ) +) + +(define-method get_dest_item_at_pos + (of-object "GtkIconView") + (c-name "gtk_icon_view_get_dest_item_at_pos") + (return-type "gboolean") + (parameters + '("gint" "drag_x") + '("gint" "drag_y") + '("GtkTreePath**" "path") + '("GtkIconViewDropPosition*" "pos") + ) +) + +(define-method create_drag_icon + (of-object "GtkIconView") + (c-name "gtk_icon_view_create_drag_icon") + (return-type "GdkPixmap*") + (parameters + '("GtkTreePath*" "path") + ) +) + ;; From /opt/gtk2/include/gtk-2.0/gtk/gtkimage.h (define-function gtk_image_get_type @@ -9241,6 +9465,12 @@ ) ) +(define-method clear + (of-object "GtkImage")s + (c-name "gtk_image_clear") + (return-type "none") +) + (define-method set_from_pixmap (of-object "GtkImage") (c-name "gtk_image_set_from_pixmap") @@ -11659,6 +11889,35 @@ (return-type "GtkWidget*") ) +(define-method get_pack_direction + (of-object "GtkMenuBar") + (c-name "gtk_menu_bar_get_pack_direction") + (return-type "GtkPackDirection") +) + +(define-method set_pack_direction + (of-object "GtkMenuBar") + (c-name "gtk_menu_bar_set_pack_direction") + (return-type "none") + (parameters + '("GtkPackDirection" "pack_dir") + ) +) + +(define-method get_child_pack_direction + (of-object "GtkMenuBar") + (c-name "gtk_menu_bar_get_child_pack_direction") + (return-type "GtkPackDirection") +) + +(define-method set_child_pack_direction + (of-object "GtkMenuBar") + (c-name "gtk_menu_bar_set_child_pack_direction") + (return-type "none") + (parameters + '("GtkPackDirection" "child_pack_dir") + ) +) ;; From /opt/gtk2/include/gtk-2.0/gtk/gtkmenuitem.h @@ -11930,6 +12189,22 @@ (return-type "gint") ) +(define-method get_take_focus + (of-object "GtkMenuShell") + (c-name "gtk_menu_shell_get_take_focus") + (return-type "gboolean") +) + +(define-method set_take_focus + (of-object "GtkMenuShell") + (c-name "gtk_menu_shell_set_take_focus") + (return-type "none") + (parameters + '("gboolean" "take_focus") + ) +) + + ;; From /opt/gnome-2.10/include/gtk-2.0/gtk/gtkmenutoolbutton.h (define-function gtk_menu_tool_button_get_type @@ -14168,6 +14443,18 @@ (return-type "GtkAdjustment*") ) +(define-method get_hscrollbar + (of-object "GtkScrolledWindow") + (c-name "gtk_scrolled_window_get_hscrollbar") + (return-type "GtkWidget*") +) + +(define-method get_vscrollbar + (of-object "GtkScrolledWindow") + (c-name "gtk_scrolled_window_get_vscrollbar") + (return-type "GtkWidget*") +) + (define-method set_policy (of-object "GtkScrolledWindow") (c-name "gtk_scrolled_window_set_policy") @@ -14706,6 +14993,21 @@ (return-type "GtkSizeGroupMode") ) +(define-method set_ignore_hidden + (of-object "GtkSizeGroup") + (c-name "gtk_size_group_set_ignore_hidden") + (return-type "none") + (parameters + '("gboolean" "ignore_hidden") + ) +) + +(define-method get_ignore_hidden + (of-object "GtkSizeGroup") + (c-name "gtk_size_group_get_ignore_hidden") + (return-type "gboolean") +) + (define-method add_widget (of-object "GtkSizeGroup") (c-name "gtk_size_group_add_widget") @@ -15136,6 +15438,16 @@ (return-type "none") ) +(define-function gtk_stock_set_translate_func + (c-name "gtk_stock_set_translate_func") + (return-type "none") + (parameters + '("const-gchar*" "domain") + '("GtkTranslateFunc" "func") + '("gpointer" "data") + '("GtkDestroyNotify" "notify") + ) +) ;; From /opt/gtk2/include/gtk-2.0/gtk/gtkstyle.h @@ -17590,6 +17902,36 @@ ) ) +(define-method forward_visible_line + (of-object "GtkTextIter") + (c-name "gtk_text_iter_forward_visible_line") + (return-type "gboolean") +) + +(define-method backward_visible_line + (of-object "GtkTextIter") + (c-name "gtk_text_iter_backward_visible_line") + (return-type "gboolean") +) + +(define-method forward_visible_lines + (of-object "GtkTextIter") + (c-name "gtk_text_iter_forward_visible_lines") + (return-type "gboolean") + (parameters + '("gint" "count") + ) +) + +(define-method backward_visible_lines + (of-object "GtkTextIter") + (c-name "gtk_text_iter_backward_visible_lines") + (return-type "gboolean") + (parameters + '("gint" "count") + ) +) + (define-method forward_visible_word_end (of-object "GtkTextIter") (c-name "gtk_text_iter_forward_visible_word_end") @@ -19406,6 +19748,21 @@ ) ) +(define-method set_icon_name + (of-object "GtkToolButton") + (c-name "gtk_tool_button_set_icon_name") + (return-type "none") + (parameters + '("const-gchar*" "icon_name") + ) +) + +(define-method get_icon_name + (of-object "GtkToolButton") + (c-name "gtk_tool_button_get_icon_name") + (return-type "const-gchar*") +) + (define-method get_stock_id (of-object "GtkToolButton") (c-name "gtk_tool_button_get_stock_id") @@ -24353,6 +24710,22 @@ (return-type "gboolean") ) + +(define-method set_urgency_hint + (of-object "GtkWindow") + (c-name "gtk_window_set_urgency_hint") + (return-type "none") + (parameters + '("gboolean" "setting") + ) +) + +(define-method get_urgency_hint + (of-object "GtkWindow") + (c-name "gtk_window_get_urgency_hint") + (return-type "gboolean") +) + (define-method set_accept_focus (of-object "GtkWindow") (c-name "gtk_window_set_accept_focus") @@ -24672,6 +25045,15 @@ (return-type "none") ) +(define-method present_with_time + (of-object "GtkWindow") + (c-name "gtk_window_present_with_time") + (return-type "none") + (parameters + '("guint32" "timestamp") + ) +) + (define-method iconify (of-object "GtkWindow") (c-name "gtk_window_iconify") diff --git a/pango-types.defs b/pango-types.defs index 507a3d42..ddbd3691 100644 --- a/pango-types.defs +++ b/pango-types.defs @@ -57,6 +57,13 @@ (gtype-id "PANGO_TYPE_LAYOUT") ) +(define-object Renderer + (in-module "Pango") + (parent "GObject") + (c-name "PangoRenderer") + (gtype-id "PANGO_TYPE_RENDERER") +) + ;; boxed definitions ... @@ -334,3 +341,15 @@ ) ) +(define-enum RenderPart + (in-module "Pango") + (c-name "PangoRenderPart") + (gtype-id "PANGO_TYPE_RENDER_PART") + (values + '("foreground" "PANGO_RENDER_PART_FOREGROUND") + '("background" "PANGO_RENDER_PART_BACKGROUND") + '("underline" "PANGO_RENDER_PART_UNDERLINE") + '("strikethrough" "PANGO_RENDER_PART_STRIKETHROUGH") + ) +) + @@ -1742,6 +1742,155 @@ ) + +;; From /home/jdahlin/dev/gtk-2.8/pango/pango/pango-renderer.h + +(define-function pango_renderer_get_type + (c-name "pango_renderer_get_type") + (return-type "GType") +) + +(define-method draw_layout + (of-object "PangoRenderer") + (c-name "pango_renderer_draw_layout") + (return-type "none") + (parameters + '("PangoLayout*" "layout") + '("int" "x") + '("int" "y") + ) +) + +(define-method draw_layout_line + (of-object "PangoRenderer") + (c-name "pango_renderer_draw_layout_line") + (return-type "none") + (parameters + '("PangoLayoutLine*" "line") + '("int" "x") + '("int" "y") + ) +) + +(define-method draw_glyphs + (of-object "PangoRenderer") + (c-name "pango_renderer_draw_glyphs") + (return-type "none") + (parameters + '("PangoFont*" "font") + '("PangoGlyphString*" "glyphs") + '("int" "x") + '("int" "y") + ) +) + +(define-method draw_rectangle + (of-object "PangoRenderer") + (c-name "pango_renderer_draw_rectangle") + (return-type "none") + (parameters + '("PangoRenderPart" "part") + '("int" "x") + '("int" "y") + '("int" "width") + '("int" "height") + ) +) + +(define-method draw_error_underline + (of-object "PangoRenderer") + (c-name "pango_renderer_draw_error_underline") + (return-type "none") + (parameters + '("int" "x") + '("int" "y") + '("int" "width") + '("int" "height") + ) +) + +(define-method draw_trapezoid + (of-object "PangoRenderer") + (c-name "pango_renderer_draw_trapezoid") + (return-type "none") + (parameters + '("PangoRenderPart" "part") + '("double" "y1_") + '("double" "x11") + '("double" "x21") + '("double" "y2") + '("double" "x12") + '("double" "x22") + ) +) + +(define-method draw_glyph + (of-object "PangoRenderer") + (c-name "pango_renderer_draw_glyph") + (return-type "none") + (parameters + '("PangoFont*" "font") + '("PangoGlyph" "glyph") + '("double" "x") + '("double" "y") + ) +) + +(define-method activate + (of-object "PangoRenderer") + (c-name "pango_renderer_activate") + (return-type "none") +) + +(define-method deactivate + (of-object "PangoRenderer") + (c-name "pango_renderer_deactivate") + (return-type "none") +) + +(define-method part_changed + (of-object "PangoRenderer") + (c-name "pango_renderer_part_changed") + (return-type "none") + (parameters + '("PangoRenderPart" "part") + ) +) + +(define-method set_color + (of-object "PangoRenderer") + (c-name "pango_renderer_set_color") + (return-type "none") + (parameters + '("PangoRenderPart" "part") + '("const-PangoColor*" "color") + ) +) + +(define-method get_color + (of-object "PangoRenderer") + (c-name "pango_renderer_get_color") + (return-type "PangoColor*") + (parameters + '("PangoRenderPart" "part") + ) +) + +(define-method set_matrix + (of-object "PangoRenderer") + (c-name "pango_renderer_set_matrix") + (return-type "none") + (parameters + '("const-PangoMatrix*" "matrix") + ) +) + +(define-method get_matrix + (of-object "PangoRenderer") + (c-name "pango_renderer_get_matrix") + (return-type "const-PangoMatrix*") +) + ;; From /opt/gtk2/include/pango-1.0/pango/pango-tabs.h (define-function pango_tab_array_new diff --git a/tests/common.py b/tests/common.py index 64fc6f42..e9704611 100644 --- a/tests/common.py +++ b/tests/common.py @@ -15,7 +15,7 @@ def importModules(buildDir, srcDir): sys.path.insert(0, os.path.join(buildDir, 'gtk')) # testhelper sys.path.insert(0, os.path.join(buildDir, 'tests')) - + sys.argv.append('--g-fatal-warnings') import ltihooks gobject = importModule('gobject', buildDir, 'gobject/gobject.la') diff --git a/tests/runtests.py b/tests/runtests.py index a220799a..3ae71850 100644 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -31,7 +31,7 @@ def gettestnames(): names = map(lambda x: x[:-3], files) map(names.remove, SKIP_FILES) return names - + suite = unittest.TestSuite() loader = unittest.TestLoader() diff --git a/tests/test_radiobutton.py b/tests/test_radiobutton.py index 98d86dd6..f3731668 100644 --- a/tests/test_radiobutton.py +++ b/tests/test_radiobutton.py @@ -1,6 +1,9 @@ import unittest +import sys +sys.argv.append('--g-fatal-warnings') from common import gtk +print gtk.gtk_version class RadioTest(unittest.TestCase): widget_type = None |