X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktextiter.h;h=5fb99123ef3618919499955c9436a3d7ab52bffa;hb=f1f3a033e5518eaf156e46fadb9cb4d84781df49;hp=29b3bd01dcee25c4831ce4e86c443115e7facc91;hpb=ec280c7b326e45dc014e94021fd290285570ad36;p=~andy%2Fgtk
diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 29b3bd01d..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 .
*/
/*
@@ -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
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
+#include
#include
+#include
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
typedef enum {
- GTK_TEXT_SEARCH_VISIBLE_ONLY = 1 << 0,
- GTK_TEXT_SEARCH_TEXT_ONLY = 1 << 1
- /* 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
-
-