X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktextiter.h;h=5fb99123ef3618919499955c9436a3d7ab52bffa;hb=45ad8a06ad511ad95a74172172b9fe459bc666ad;hp=0b6f245174ea0bbbc979cb91a1ef87d35643cfc9;hpb=740f871a15b5bf0282bd6bbf1f4fc3423d04ce1b;p=~andy%2Fgtk

diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 0b6f24517..5fb99123e 100644
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -12,9 +12,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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,20 +22,24 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef GTK_TEXT_ITER_H
-#define GTK_TEXT_ITER_H
+#ifndef __GTK_TEXT_ITER_H__
+#define __GTK_TEXT_ITER_H__
 
-#include <gtk/gtktexttag.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtktextattributes.h>
 #include <gtk/gtktextchild.h>
+#include <gtk/gtktexttag.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum {
-  GTK_TEXT_SEARCH_VISIBLE_ONLY,
-  GTK_TEXT_SEARCH_TEXT_ONLY
-  /* Possible future plans: SEARCH_CASE_INSENSITIVE, SEARCH_REGEXP */
+  GTK_TEXT_SEARCH_VISIBLE_ONLY     = 1 << 0,
+  GTK_TEXT_SEARCH_TEXT_ONLY        = 1 << 1,
+  GTK_TEXT_SEARCH_CASE_INSENSITIVE = 1 << 2
+  /* Possible future plans: SEARCH_REGEXP */
 } GtkTextSearchFlags;
 
 /*
@@ -84,8 +86,11 @@ GtkTextBuffer *gtk_text_iter_get_buffer (const GtkTextIter *iter);
 
 GtkTextIter *gtk_text_iter_copy     (const GtkTextIter *iter);
 void         gtk_text_iter_free     (GtkTextIter       *iter);
+GDK_AVAILABLE_IN_3_2
+void         gtk_text_iter_assign   (GtkTextIter       *iter,
+                                     const GtkTextIter *other);
 
-GType        gtk_text_iter_get_type (void);
+GType        gtk_text_iter_get_type (void) G_GNUC_CONST;
 
 /*
  * Convert to different kinds of index
@@ -190,6 +195,13 @@ gboolean gtk_text_iter_forward_word_ends    (GtkTextIter *iter,
                                              gint         count);
 gboolean gtk_text_iter_backward_word_starts (GtkTextIter *iter,
                                              gint         count);
+                                             
+gboolean gtk_text_iter_forward_visible_line   (GtkTextIter *iter);
+gboolean gtk_text_iter_backward_visible_line  (GtkTextIter *iter);
+gboolean gtk_text_iter_forward_visible_lines  (GtkTextIter *iter,
+                                               gint         count);
+gboolean gtk_text_iter_backward_visible_lines (GtkTextIter *iter,
+                                               gint         count);
 
 gboolean gtk_text_iter_forward_visible_word_end     (GtkTextIter *iter);
 gboolean gtk_text_iter_backward_visible_word_start  (GtkTextIter *iter);
@@ -223,7 +235,6 @@ gboolean gtk_text_iter_forward_visible_cursor_positions  (GtkTextIter *iter,
 gboolean gtk_text_iter_backward_visible_cursor_positions (GtkTextIter *iter,
                                                           gint         count);
 
-
 void     gtk_text_iter_set_offset         (GtkTextIter *iter,
                                            gint         char_offset);
 void     gtk_text_iter_set_line           (GtkTextIter *iter,
@@ -275,7 +286,6 @@ gboolean gtk_text_iter_backward_search (const GtkTextIter *iter,
                                         GtkTextIter       *match_end,
                                         const GtkTextIter *limit);
 
-
 /*
  * Comparisons
  */
@@ -291,10 +301,6 @@ gboolean gtk_text_iter_in_range        (const GtkTextIter *iter,
 void     gtk_text_iter_order           (GtkTextIter *first,
                                         GtkTextIter *second);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
-
-