X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktextdisplay.h;h=3f130b4ba9a8a88fd6ca26fa127518d3610ff280;hb=67f5e595a796a8321d6dc7737c58476564998c07;hp=28735d57631d1d51ea5daccbd61c003384afbc7c;hpb=604eebd380ef05abb84911f341d48b3381abfe49;p=~andy%2Fgtk
diff --git a/gtk/gtktextdisplay.h b/gtk/gtktextdisplay.h
index 28735d576..3f130b4ba 100644
--- a/gtk/gtktextdisplay.h
+++ b/gtk/gtktextdisplay.h
@@ -21,8 +21,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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library. If not, see .
*
* Original Tk license:
*
@@ -74,14 +73,12 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#ifndef GTK_TEXT_DISPLAY_H
-#define GTK_TEXT_DISPLAY_H
+#ifndef __GTK_TEXT_DISPLAY_H__
+#define __GTK_TEXT_DISPLAY_H__
#include
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
/* A semi-public header intended for use by code that also
* uses GtkTextLayout
@@ -89,29 +86,16 @@ extern "C" {
/* The drawable should be pre-initialized to your preferred background.
* widget - Widget to grab some style info from
- * drawable - Drawable to render to
- * cursor_gc - Graphics context to use for cursor
- * x_offset/y_offset - Position of the drawable in layout coordinates
- * x/y/width/height - Region of the layout to render. x,y must be inside
- * the drawable.
+ * cr - Context to render to, matrix set so that (0, 0)
+ * is the top left of the layout
* widgets - list of widgets that need exposing
*/
void gtk_text_layout_draw (GtkTextLayout *layout,
GtkWidget *widget,
- GdkDrawable *drawable,
- GdkGC *cursor_gc,
- gint x_offset,
- gint y_offset,
- gint x,
- gint y,
- gint width,
- gint height,
+ cairo_t *cr,
GList **widgets);
+G_END_DECLS
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* GTK_TEXT_DISPLAY_H */
+#endif /* __GTK_TEXT_DISPLAY_H__ */