Increment page sequence before print of the page, not after

[~andy/gtk] / gtk / gtktext.h

diff --git a/gtk/gtktext.h b/gtk/gtktext.h
index b51f7b56e86c6658049916012dde7333012c969e..8bfa71aa21c3c351a2ee86deba5d8cd8770e2afe 100644 (file)
--- a/gtk/gtktext.h
+++ b/gtk/gtktext.h
@@ -21,28 +21,26 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifdef GTK_ENABLE_BROKEN
+
 #ifndef __GTK_TEXT_H__
 #define __GTK_TEXT_H__
 
 
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
 #include <gtk/gtkoldeditable.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
 
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TEXT                  (gtk_text_get_type ())
-#define GTK_TEXT(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT, GtkText))
-#define GTK_TEXT_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT, GtkTextClass))
-#define GTK_IS_TEXT(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT))
-#define GTK_IS_TEXT_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT))
-#define GTK_TEXT_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TEXT, GtkTextClass))
+#define GTK_TEXT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT, GtkText))
+#define GTK_TEXT_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT, GtkTextClass))
+#define GTK_IS_TEXT(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT))
+#define GTK_IS_TEXT_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT))
+#define GTK_TEXT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT, GtkTextClass))
 
 
 typedef struct _GtkTextFont       GtkTextFont;
@@ -177,15 +175,15 @@ struct _GtkTextClass
 };
 
 
-GtkType    gtk_text_get_type        (void) G_GNUC_CONST;
+GType      gtk_text_get_type        (void) G_GNUC_CONST;
 GtkWidget* gtk_text_new             (GtkAdjustment *hadj,
                                     GtkAdjustment *vadj);
 void       gtk_text_set_editable    (GtkText       *text,
                                     gboolean       editable);
 void       gtk_text_set_word_wrap   (GtkText       *text,
-                                    gint           word_wrap);
+                                    gboolean       word_wrap);
 void       gtk_text_set_line_wrap   (GtkText       *text,
-                                    gint           line_wrap);
+                                    gboolean       line_wrap);
 void       gtk_text_set_adjustments (GtkText       *text,
                                     GtkAdjustment *hadj,
                                     GtkAdjustment *vadj);
@@ -195,15 +193,15 @@ guint      gtk_text_get_point       (GtkText       *text);
 guint      gtk_text_get_length      (GtkText       *text);
 void       gtk_text_freeze          (GtkText       *text);
 void       gtk_text_thaw            (GtkText       *text);
-void       gtk_text_insert          (GtkText       *text,
-                                    GdkFont       *font,
-                                    GdkColor      *fore,
-                                    GdkColor      *back,
-                                    const char    *chars,
-                                    gint           length);
-gint       gtk_text_backward_delete (GtkText       *text,
+void       gtk_text_insert          (GtkText        *text,
+                                    GdkFont        *font,
+                                    const GdkColor *fore,
+                                    const GdkColor *back,
+                                    const char     *chars,
+                                    gint            length);
+gboolean   gtk_text_backward_delete (GtkText       *text,
                                     guint          nchars);
-gint       gtk_text_forward_delete  (GtkText       *text,
+gboolean   gtk_text_forward_delete  (GtkText       *text,
                                     guint          nchars);
 
 #define GTK_TEXT_INDEX(t, index)       (((t)->use_wchar) \
@@ -212,9 +210,8 @@ gint       gtk_text_forward_delete  (GtkText       *text,
        : ((index) < (t)->gap_position ? (t)->text.ch[index] : \
                                        (t)->text.ch[(index)+(t)->gap_size]))
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TEXT_H__ */
+
+#endif /* GTK_ENABLE_BROKEN */