x11: Use GDK error trapping code

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

diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index 5a35c45fb908dab719284aa3c13982b1ddf39b5f..28402cd0d0c7c9bfdc5aca07be5cc47409dbf6f3 100644 (file)
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -12,28 +12,26 @@
  * 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 <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
-void          gdk_pango_context_set_colormap   (PangoContext *context,
-                                                GdkColormap  *colormap);
 
 
 /* Get a clip region to draw only part of a layout or
@@ -42,41 +40,17 @@ void          gdk_pango_context_set_colormap   (PangoContext *context,
  * draw with the region as clip, only the given ranges are drawn.
  */
 
-GdkRegion    *gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line,
+cairo_region_t    *gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line,
                                                      gint             x_origin,
                                                      gint             y_origin,
-                                                     gint            *index_ranges,
+                                                     const gint      *index_ranges,
                                                      gint             n_ranges);
-GdkRegion    *gdk_pango_layout_get_clip_region      (PangoLayout     *layout,
+cairo_region_t    *gdk_pango_layout_get_clip_region      (PangoLayout     *layout,
                                                      gint             x_origin,
                                                      gint             y_origin,
-                                                     gint            *index_ranges,
+                                                     const gint      *index_ranges,
                                                      gint             n_ranges);
 
+G_END_DECLS
 
-
-/* Attributes use to render insensitive text in GTK+. */
-
-typedef struct _GdkPangoAttrStipple GdkPangoAttrStipple;
-typedef struct _GdkPangoAttrEmbossed GdkPangoAttrEmbossed;
-
-struct _GdkPangoAttrStipple
-{
-  PangoAttribute attr;
-  GdkBitmap *stipple;
-};
-
-struct _GdkPangoAttrEmbossed
-{
-  PangoAttribute attr;
-  gboolean embossed;
-};
-
-PangoAttribute *gdk_pango_attr_stipple_new  (GdkBitmap *stipple);
-PangoAttribute *gdk_pango_attr_embossed_new (gboolean embossed);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __GDK_FONT_H__ */
+#endif /* __GDK_PANGO_H__ */