]> Pileus Git - ~andy/gtk/blobdiff - gdk/gdkpango.h
API: remove gdk_draw_rectangle()
[~andy/gtk] / gdk / gdkpango.h
index 492f144ad10d8ba1fa743a17b9481d81e3f3ced6..512552c592042d79c036398804334958e7192baa 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
 #ifndef __GDK_PANGO_H__
 #define __GDK_PANGO_H__
 
 #include <gdk/gdktypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* Pango interaction */
 
@@ -106,10 +108,6 @@ PangoContext *gdk_pango_context_get_for_screen (GdkScreen    *screen);
 #ifndef GDK_MULTIHEAD_SAFE
 PangoContext *gdk_pango_context_get            (void);
 #endif
-#ifndef GDK_DISABLE_DEPRECATED
-void          gdk_pango_context_set_colormap   (PangoContext *context,
-                                                GdkColormap  *colormap);
-#endif 
 
 
 /* Get a clip region to draw only part of a layout or
@@ -118,15 +116,15 @@ 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);
 
 
@@ -135,6 +133,7 @@ GdkRegion    *gdk_pango_layout_get_clip_region      (PangoLayout     *layout,
 
 typedef struct _GdkPangoAttrStipple GdkPangoAttrStipple;
 typedef struct _GdkPangoAttrEmbossed GdkPangoAttrEmbossed;
+typedef struct _GdkPangoAttrEmbossColor GdkPangoAttrEmbossColor;
 
 struct _GdkPangoAttrStipple
 {
@@ -148,11 +147,16 @@ struct _GdkPangoAttrEmbossed
   gboolean embossed;
 };
 
+struct _GdkPangoAttrEmbossColor
+{
+  PangoAttribute attr;
+  PangoColor color;
+};
+
 PangoAttribute *gdk_pango_attr_stipple_new  (GdkBitmap *stipple);
 PangoAttribute *gdk_pango_attr_embossed_new (gboolean embossed);
+PangoAttribute *gdk_pango_attr_emboss_color_new (const GdkColor *color);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* __GDK_FONT_H__ */
+#endif /* __GDK_PANGO_H__ */