x11: Use GDK error trapping code

[~andy/gtk] / gdk / gdkpango.h

diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index 26b967055f044afecc4eebe2a4a098f5053f10c4..28402cd0d0c7c9bfdc5aca07be5cc47409dbf6f3 100644 (file)
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -2,44 +2,55 @@
  * Copyright (C) 2000 Red Hat, Inc. 
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library 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.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GDK_PANGO_H__
 #define __GDK_PANGO_H__
 
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
+
+/************************************************************************/
 
-/* Pango interaction */
+PangoContext *gdk_pango_context_get_for_screen (GdkScreen    *screen);
+#ifndef GDK_MULTIHEAD_SAFE
+PangoContext *gdk_pango_context_get            (void);
+#endif
 
-/* FIXME: The following function needs more parameters so that we can
- * properly deal with different visuals, the potential for multiple
- * screens in the future, etc. The PangoContext needs enough information
- * in it to create new GC's and to set the colors on those GC's.
- * A colormap is not sufficient.
+
+/* Get a clip region to draw only part of a layout or
+ * line. index_ranges contains alternating range starts/stops. The
+ * region is the region which contains the given ranges, i.e. if you
+ * draw with the region as clip, only the given ranges are drawn.
  */
-PangoContext *gdk_pango_context_get          (void);
-void          gdk_pango_context_set_colormap (PangoContext *context,
-                                             GdkColormap  *colormap);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+cairo_region_t    *gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line,
+                                                     gint             x_origin,
+                                                     gint             y_origin,
+                                                     const gint      *index_ranges,
+                                                     gint             n_ranges);
+cairo_region_t    *gdk_pango_layout_get_clip_region      (PangoLayout     *layout,
+                                                     gint             x_origin,
+                                                     gint             y_origin,
+                                                     const gint      *index_ranges,
+                                                     gint             n_ranges);
+
+G_END_DECLS
 
-#endif /* __GDK_FONT_H__ */
+#endif /* __GDK_PANGO_H__ */