ignore-glob (pango_cairo_update_context, pango_cairo_create_layout)

* pangocairo.override (*_get_type): ignore-glob (pango_cairo_update_context, pango_cairo_create_layout) (pango_cairo_update_layout, pango_cairo_show_glyph_string) (pango_cairo_show_layout_line, pango_cairo_show_layout) (pango_cairo_glyph_string_path, pango_cairo_layout_line_path) (pango_cairo_layout_path): ignore. * pangocairo.defs (pango_cairo_update_context) (pango_cairo_context_set_font_options) (pango_cairo_context_get_font_options) (pango_cairo_context_set_resolution) (pango_cairo_context_get_resolution, pango_cairo_create_layout) (pango_cairo_update_layout, pango_cairo_show_glyph_string) (pango_cairo_show_layout_line, pango_cairo_show_layout) (pango_cairo_glyph_string_path, pango_cairo_layout_line_path) (pango_cairo_layout_path): Add.
nzjrs · Jul 24, 2006 · bc09154 · bc09154
1 parent 1a0fe75
commit bc09154
Show file tree

Hide file tree

Showing 3 changed files with 156 additions and 10 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,22 @@
 2006-07-24  John Finlay  <finlay@moeraki.com>
 
+	* pangocairo.override (*_get_type): ignore-glob
+	(pango_cairo_update_context, pango_cairo_create_layout)
+	(pango_cairo_update_layout, pango_cairo_show_glyph_string)
+	(pango_cairo_show_layout_line, pango_cairo_show_layout)
+	(pango_cairo_glyph_string_path, pango_cairo_layout_line_path)
+	(pango_cairo_layout_path): ignore.
+
+	* pangocairo.defs (pango_cairo_update_context)
+	(pango_cairo_context_set_font_options)
+	(pango_cairo_context_get_font_options)
+	(pango_cairo_context_set_resolution)
+	(pango_cairo_context_get_resolution, pango_cairo_create_layout)
+	(pango_cairo_update_layout, pango_cairo_show_glyph_string)
+	(pango_cairo_show_layout_line, pango_cairo_show_layout)
+	(pango_cairo_glyph_string_path, pango_cairo_layout_line_path)
+	(pango_cairo_layout_path): Add.
+
 	* pango.override (*_get_type, *_ref, *_unref, *_free): ignore-glob
 	(pango_default_break): ignore
 

diff --git a/pangocairo.defs b/pangocairo.defs
@@ -1,21 +1,20 @@
 ;; From /opt/gnome-devel/include/pango-1.0/pango/pangocairo.h
 
-; (define-function cairo_font_map_get_type
-;   (c-name "pango_cairo_font_map_get_type")
-;   (return-type "GType")
-; )
-
-(define-object CairoFontMap
-  (in-module "pango")
-  (parent "PangoFontMap")
+(define-interface CairoFontMap
+  (in-module "Pango")
   (c-name "PangoCairoFontMap")
   (gtype-id "PANGO_TYPE_CAIRO_FONT_MAP")
+  (prerequisite "PangoFontMap")
+)
+
+(define-function font_map_get_type
+  (c-name "pango_cairo_font_map_get_type")
+  (return-type "GType")
 )
 
 (define-function cairo_font_map_new
   (c-name "pango_cairo_font_map_new")
-  (is-constructor-of "PangoCairoFontMap")
-  (return-type "PangoCairoFontMap*")
+  (return-type "PangoFontMap*")
 )
 
 (define-function cairo_font_map_get_default
@@ -44,4 +43,120 @@
   (return-type "PangoContext*")
 )
 
+(define-function update_context
+  (c-name "pango_cairo_update_context")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("PangoContext*" "context")
+  )
+)
+
+(define-function context_set_font_options
+  (c-name "pango_cairo_context_set_font_options")
+  (return-type "none")
+  (parameters
+    '("PangoContext*" "context")
+    '("const-cairo_font_options_t*" "options")
+  )
+)
+
+(define-function context_get_font_options
+  (c-name "pango_cairo_context_get_font_options")
+  (return-type "const-cairo_font_options_t*")
+  (parameters
+    '("PangoContext*" "context")
+  )
+)
+
+(define-function context_set_resolution
+  (c-name "pango_cairo_context_set_resolution")
+  (return-type "none")
+  (parameters
+    '("PangoContext*" "context")
+    '("double" "dpi")
+  )
+)
+
+(define-function context_get_resolution
+  (c-name "pango_cairo_context_get_resolution")
+  (return-type "double")
+  (parameters
+    '("PangoContext*" "context")
+  )
+)
+
+(define-function create_layout
+  (c-name "pango_cairo_create_layout")
+  (return-type "PangoLayout*")
+  (parameters
+    '("cairo_t*" "cr")
+  )
+)
+
+(define-function update_layout
+  (c-name "pango_cairo_update_layout")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("PangoLayout*" "layout")
+  )
+)
+
+(define-function show_glyph_string
+  (c-name "pango_cairo_show_glyph_string")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("PangoFont*" "font")
+    '("PangoGlyphString*" "glyphs")
+  )
+)
+
+(define-function show_layout_line
+  (c-name "pango_cairo_show_layout_line")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("PangoLayoutLine*" "line")
+  )
+)
+
+(define-function show_layout
+  (c-name "pango_cairo_show_layout")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("PangoLayout*" "layout")
+  )
+)
+
+(define-function glyph_string_path
+  (c-name "pango_cairo_glyph_string_path")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("PangoFont*" "font")
+    '("PangoGlyphString*" "glyphs")
+  )
+)
+
+(define-function layout_line_path
+  (c-name "pango_cairo_layout_line_path")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("PangoLayoutLine*" "line")
+  )
+)
+
+(define-function layout_path
+  (c-name "pango_cairo_layout_path")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("PangoLayout*" "layout")
+  )
+)
+
 
diff --git a/pangocairo.override b/pangocairo.override
@@ -21,6 +21,20 @@ import pango.Context as PyPangoContext_Type
 import pango.Layout as PyPangoLayout_Type
 import pango.Font as PyPangoFont_Type
 
+%%
+ignore
+  pango_cairo_update_context
+  pango_cairo_create_layout
+  pango_cairo_update_layout
+  pango_cairo_show_glyph_string
+  pango_cairo_show_layout_line
+  pango_cairo_show_layout
+  pango_cairo_glyph_string_path
+  pango_cairo_layout_line_path
+  pango_cairo_layout_path
+%%
+ignore-glob
+  *_get_type
 %%
 define context_get_font_options kwargs
 static PyObject *