X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gdk%2Fgdkpango.c;h=ca5745beb27f012eb1d47b549f3e367d59df4c12;hb=c37de57f14d57ece9d0dd80a01a33641d71def93;hp=907b51798be769e237ea83909dc303b2530e498b;hpb=57a94bfb5364392a2469c592c4cf88536be7e061;p=~andy%2Fgtk diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c index 907b51798..ca5745beb 100644 --- a/gdk/gdkpango.c +++ b/gdk/gdkpango.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ #include "config.h" @@ -190,11 +188,13 @@ layout_iter_get_line_clip_region (PangoLayoutIter *iter, } /** - * gdk_pango_layout_line_get_clip_region: + * gdk_pango_layout_line_get_clip_region: (skip) * @line: a #PangoLayoutLine * @x_origin: X pixel where you intend to draw the layout line with this clip * @y_origin: baseline pixel where you intend to draw the layout line with this clip - * @index_ranges: array of byte indexes into the layout, where even members of array are start indexes and odd elements are end indexes + * @index_ranges: (array): array of byte indexes into the layout, + * where even members of array are start indexes and odd elements + * are end indexes * @n_ranges: number of ranges in @index_ranges, i.e. half the size of @index_ranges * * Obtains a clip region which contains the areas where the given @@ -239,7 +239,7 @@ gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line, } /** - * gdk_pango_layout_get_clip_region: + * gdk_pango_layout_get_clip_region: (skip) * @layout: a #PangoLayout * @x_origin: X pixel where you intend to draw the layout with this clip * @y_origin: Y pixel where you intend to draw the layout with this clip @@ -354,12 +354,11 @@ gdk_pango_context_get_for_screen (GdkScreen *screen) PangoContext *context; const cairo_font_options_t *options; double dpi; - + g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); fontmap = pango_cairo_font_map_get_default (); - - context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fontmap)); + context = pango_font_map_create_context (fontmap); options = gdk_screen_get_font_options (screen); pango_cairo_context_set_font_options (context, options);