[gtksourceviewmm] Update to gtksourceview-2.91.1.



commit 102e5edffea8f9073abee25c43ac807d27b0e492
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Tue Nov 2 21:14:23 2010 +0100

    Update to gtksourceview-2.91.1.
    
    * configure.ac: Bumped needed gtksourceview version.
    * gtksourceview/src/sourceiter.ccg:
    * gtksourceview/src/sourceiter.hg: Removed obsolete class - case
    insensitive search is already supported in Gtk.
    * gtksourceview/gtksourceviewmm.h:
    * gtksourceview/gtksourceviewmm/.gitignore:
    * gtksourceview/src/filelist.am:
    * gtksourceview/src/sourcecompletioncontext.ccg:
    * gtksourceview/src/sourcecompletioncontext.hg: Removed usage of SourceIter
    class.
    * gtksourceview/src/sourcebuffer.hg: Wrapped "bracket-matched" signal.
    * gtksourceview/src/gtksourceview_enums.defs:
    * gtksourceview/src/gtksourceview_methods.defs:
    * gtksourceview/src/gtksourceview_signals.defs: Regenerated so they don't
    contain information about obsolete functions and enum.

 configure.ac                                  |    2 +-
 gtksourceview/gtksourceviewmm.h               |    1 -
 gtksourceview/gtksourceviewmm/.gitignore      |    1 -
 gtksourceview/src/filelist.am                 |    3 +-
 gtksourceview/src/gtksourceview_enums.defs    |   21 ---
 gtksourceview/src/gtksourceview_methods.defs  |   41 ------
 gtksourceview/src/gtksourceview_signals.defs  |    4 +-
 gtksourceview/src/sourcebuffer.hg             |    5 +-
 gtksourceview/src/sourcecompletioncontext.ccg |    8 +-
 gtksourceview/src/sourcecompletioncontext.hg  |    5 +-
 gtksourceview/src/sourceiter.ccg              |  113 ----------------
 gtksourceview/src/sourceiter.hg               |  176 -------------------------
 12 files changed, 11 insertions(+), 369 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6a72da1..c36d9f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_SUBST([GTKSOURCEVIEWMM_SO_VERSION], [0:0:0])
 LT_INIT([win32-dll disable-static])
 AC_PROG_CXX
 
-AC_SUBST([GTKSOURCEVIEWMM_MODULES], ['gtkmm-3.0 >= 2.91.2 gtksourceview-3.0 >= 2.91.0'])
+AC_SUBST([GTKSOURCEVIEWMM_MODULES], ['gtkmm-3.0 >= 2.91.2 gtksourceview-3.0 >= 2.91.1'])
 PKG_CHECK_MODULES([GTKSOURCEVIEWMM], [$GTKSOURCEVIEWMM_MODULES])
 
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
diff --git a/gtksourceview/gtksourceviewmm.h b/gtksourceview/gtksourceviewmm.h
index e0eeaec..62af9cf 100644
--- a/gtksourceview/gtksourceviewmm.h
+++ b/gtksourceview/gtksourceviewmm.h
@@ -82,7 +82,6 @@
 #include <gtksourceviewmm/sourcecompletionprovider.h>
 #include <gtksourceviewmm/sourcecompletionwords.h>
 #include <gtksourceviewmm/sourcegutter.h>
-#include <gtksourceviewmm/sourceiter.h>
 #include <gtksourceviewmm/sourcelanguage.h>
 #include <gtksourceviewmm/sourcelanguagemanager.h>
 #include <gtksourceviewmm/sourcemark.h>
diff --git a/gtksourceview/gtksourceviewmm/.gitignore b/gtksourceview/gtksourceviewmm/.gitignore
index 9a8bdab..3f67f01 100644
--- a/gtksourceview/gtksourceviewmm/.gitignore
+++ b/gtksourceview/gtksourceviewmm/.gitignore
@@ -8,7 +8,6 @@
 /sourcecompletionprovider.*
 /sourcecompletionwords.*
 /sourcegutter.*
-/sourceiter.*
 /sourcelanguage.*
 /sourcelanguagemanager.*
 /sourcemark.*
diff --git a/gtksourceview/src/filelist.am b/gtksourceview/src/filelist.am
index a132644..879c2d1 100644
--- a/gtksourceview/src/filelist.am
+++ b/gtksourceview/src/filelist.am
@@ -19,7 +19,6 @@ files_hg =				\
 	sourcecompletionprovider.hg	\
 	sourcecompletionwords.hg        \
 	sourcegutter.hg			\
-	sourceiter.hg			\
 	sourcelanguage.hg		\
 	sourcelanguagemanager.hg	\
 	sourcemark.hg			\
@@ -27,7 +26,7 @@ files_hg =				\
 	sourcestyle.hg			\
 	sourcestylescheme.hg		\
 	sourcestyleschememanager.hg	\
-	sourceundomanager.hg            \
+	sourceundomanager.hg		\
 	sourceview.hg
 
 files_ccg = $(files_hg:.hg=.ccg)
diff --git a/gtksourceview/src/gtksourceview_enums.defs b/gtksourceview/src/gtksourceview_enums.defs
index d68c03b..4998b41 100644
--- a/gtksourceview/src/gtksourceview_enums.defs
+++ b/gtksourceview/src/gtksourceview_enums.defs
@@ -58,27 +58,6 @@
   )
 )
 
-;; From gtksourceiter.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;; 	GTK_SOURCE_SEARCH_VISIBLE_ONLY		 = 1 << 0,
-;; 	GTK_SOURCE_SEARCH_TEXT_ONLY		 = 1 << 1,
-;; 	GTK_SOURCE_SEARCH_CASE_INSENSITIVE	 = 1 << 2
-;; 	/* Possible future plans: SEARCH_REGEXP */
-;; } GtkSourceSearchFlags;
-
-(define-flags-extended SourceSearchFlags
-  (in-module "Gtk")
-  (c-name "GtkSourceSearchFlags")
-  (values
-    '("visible-only" "GTK_SOURCE_SEARCH_VISIBLE_ONLY" "1 << 0")
-    '("text-only" "GTK_SOURCE_SEARCH_TEXT_ONLY" "1 << 1")
-    '("case-insensitive" "GTK_SOURCE_SEARCH_CASE_INSENSITIVE" "1 << 2")
-  )
-)
-
 ;; From gtksourceview.h
 
 ;; Original typedef:
diff --git a/gtksourceview/src/gtksourceview_methods.defs b/gtksourceview/src/gtksourceview_methods.defs
index e8dc77a..c84f3e6 100644
--- a/gtksourceview/src/gtksourceview_methods.defs
+++ b/gtksourceview/src/gtksourceview_methods.defs
@@ -151,17 +151,6 @@
   )
 )
 
-(define-flags SourceSearchFlags
-  (in-module "Gtk")
-  (c-name "GtkSourceSearchFlags")
-  (gtype-id "GTK_TYPE_SOURCE_SEARCH_FLAGS")
-  (values
-    '("visible-only" "GTK_SOURCE_SEARCH_VISIBLE_ONLY")
-    '("text-only" "GTK_SOURCE_SEARCH_TEXT_ONLY")
-    '("case-insensitive" "GTK_SOURCE_SEARCH_CASE_INSENSITIVE")
-  )
-)
-
 (define-enum SourceViewGutterPosition
   (in-module "Gtk")
   (c-name "GtkSourceViewGutterPosition")
@@ -923,36 +912,6 @@
 
 
 
-;; From gtksourceiter.h
-
-(define-function gtk_source_iter_forward_search
-  (c-name "gtk_source_iter_forward_search")
-  (return-type "gboolean")
-  (parameters
-    '("const-GtkTextIter*" "iter")
-    '("const-gchar*" "str")
-    '("GtkSourceSearchFlags" "flags")
-    '("GtkTextIter*" "match_start")
-    '("GtkTextIter*" "match_end")
-    '("const-GtkTextIter*" "limit")
-  )
-)
-
-(define-function gtk_source_iter_backward_search
-  (c-name "gtk_source_iter_backward_search")
-  (return-type "gboolean")
-  (parameters
-    '("const-GtkTextIter*" "iter")
-    '("const-gchar*" "str")
-    '("GtkSourceSearchFlags" "flags")
-    '("GtkTextIter*" "match_start")
-    '("GtkTextIter*" "match_end")
-    '("const-GtkTextIter*" "limit")
-  )
-)
-
-
-
 ;; From gtksourcelanguage.h
 
 (define-function gtk_source_language_get_type
diff --git a/gtksourceview/src/gtksourceview_signals.defs b/gtksourceview/src/gtksourceview_signals.defs
index 4eb21bd..3b77170 100644
--- a/gtksourceview/src/gtksourceview_signals.defs
+++ b/gtksourceview/src/gtksourceview_signals.defs
@@ -1546,7 +1546,7 @@
 (define-property hadjustment
   (of-object "GtkSourceView")
   (prop-type "GParamObject")
-  (docs "Horizontal adjustment that is shared between scrollable widget and it's controller")
+  (docs "Horizontal adjustment that is shared between the scrollable widget and its controller")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1564,7 +1564,7 @@
 (define-property vadjustment
   (of-object "GtkSourceView")
   (prop-type "GParamObject")
-  (docs "Vertical adjustment that is shared between scrollable widget and it's controller")
+  (docs "Vertical adjustment that is shared between the scrollable widget and its controller")
   (readable #t)
   (writable #t)
   (construct-only #f)
diff --git a/gtksourceview/src/sourcebuffer.hg b/gtksourceview/src/sourcebuffer.hg
index c9056e4..7935914 100644
--- a/gtksourceview/src/sourcebuffer.hg
+++ b/gtksourceview/src/sourcebuffer.hg
@@ -488,9 +488,6 @@ public:
    */
   _WRAP_SIGNAL(void redo(), "redo")
 
-  // TODO: iter may be sent as NULL, so here we will have segfault when no bracket is matched. - krnowak
-  // TODO: also documentation is wrong - state is a pointer, not a value. - krnowak
-  // TODO: this is filed as bug #633400. - krnowak
   /** Sets iter to a valid iterator pointing to the matching bracket if state is SourceBracketMatchType::SOURCE_BRACKET_MATCH_FOUND.
    *
    * @par Handler parameters:
@@ -499,7 +496,7 @@ public:
    *
    * @newin{3,0}
    */
-  //_WRAP_SIGNAL(void bracket_matched(Gtk::TextIter& iter, SourceBracketMatchType state), "bracket-matched")
+  _WRAP_SIGNAL(void bracket_matched(Gtk::TextIter& iter, SourceBracketMatchType state), "bracket-matched")
 };
 
 } /* namespace gtksourceview */
diff --git a/gtksourceview/src/sourcecompletioncontext.ccg b/gtksourceview/src/sourcecompletioncontext.ccg
index 557ade9..50dd1a8 100644
--- a/gtksourceview/src/sourcecompletioncontext.ccg
+++ b/gtksourceview/src/sourcecompletioncontext.ccg
@@ -22,11 +22,11 @@
 namespace gtksourceview
 {
 
-SourceIter SourceCompletionContext::get_iter() const
+Gtk::TextIter SourceCompletionContext::get_iter() const
 {
-  GtkTextIter iter;
-  gtk_source_completion_context_get_iter(const_cast<GtkSourceCompletionContext*>(gobj()), &iter);
-  return SourceIter(&iter);
+  Gtk::TextIter iter;
+  gtk_source_completion_context_get_iter(const_cast<GtkSourceCompletionContext*>(gobj()), iter.gobj());
+  return iter;
 }
 
 } // namespace gtksourceview
diff --git a/gtksourceview/src/sourcecompletioncontext.hg b/gtksourceview/src/sourcecompletioncontext.hg
index f98a7bc..a7cc20f 100644
--- a/gtksourceview/src/sourcecompletioncontext.hg
+++ b/gtksourceview/src/sourcecompletioncontext.hg
@@ -20,7 +20,6 @@
 #include <glibmm/object.h>
 
 #include <gtksourceviewmm/sourcecompletionactivation.h>
-#include <gtksourceviewmm/sourceiter.h>
 #include <gtksourceviewmm/sourceview.h>
 #include <gtksourceviewmm/sourcecompletionprovider.h>
 #include <gtksourceviewmm/sourcecompletionproposal.h>
@@ -74,7 +73,7 @@ public:
    *
    * @newin{2,10}
    */
-  SourceIter get_iter() const;
+  Gtk::TextIter get_iter() const;
 
   /** Get the context activation
    *
@@ -86,7 +85,7 @@ public:
 
   _WRAP_PROPERTY("activation", SourceCompletionActivation)
   _WRAP_PROPERTY("completion", Glib::RefPtr<SourceCompletion>)
-  _WRAP_PROPERTY("iter", SourceIter)
+  _WRAP_PROPERTY("iter", Gtk::TextIter)
 
   /** Emitted when the current population of proposals has been cancelled.
    *



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]