gtksourceviewmm r57 - in trunk: . docs docs/reference gtksourceview gtksourceview/gtksourceviewmm gtksourceview/gtksourceviewmm/private gtksourceview/src scripts tests tools tools/extra_defs_gen tools/m4

[jjongsma svn gnome org]

Author: jjongsma
Date: Sat Jan 12 19:05:16 2008
New Revision: 57
URL: http://svn.gnome.org/viewvc/gtksourceviewmm?rev=57&view=rev

Log:
2008-01-12  Jonathon Jongsma <jjongsma gnome org>

	* gtksourceview/src/gtksourceview_enums.defs:
	* gtksourceview/src/gtksourceview_signals.defs:
	* gtksourceview/src/gtksourceview_methods.defs: re-generated .defs file for
	new API in gtksourceview 2.1
	* tools/m4/convert_gtksourceviewmm.m4:
	* tools/extra_defs_gen/generate_defs_gtk.cc:
	* gtksourceview/src/sourcebuffer.hg:
	* gtksourceview/src/sourceview.hg:
	* gtksourceview/src/sourcelanguage.hg: wrapped some additional API in
	SourceView, SourceBuffer, and SourceLanguage


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/docs/   (props changed)
   trunk/docs/reference/   (props changed)
   trunk/gtksourceview/   (props changed)
   trunk/gtksourceview/gtksourceviewmm/   (props changed)
   trunk/gtksourceview/gtksourceviewmm/private/   (props changed)
   trunk/gtksourceview/src/   (props changed)
   trunk/gtksourceview/src/gtksourceview_enums.defs
   trunk/gtksourceview/src/gtksourceview_methods.defs
   trunk/gtksourceview/src/gtksourceview_signals.defs
   trunk/gtksourceview/src/sourcebuffer.hg
   trunk/gtksourceview/src/sourcelanguage.hg
   trunk/gtksourceview/src/sourceview.hg
   trunk/scripts/   (props changed)
   trunk/tests/   (props changed)
   trunk/tools/   (props changed)
   trunk/tools/extra_defs_gen/   (props changed)
   trunk/tools/extra_defs_gen/generate_defs_gtk.cc
   trunk/tools/m4/   (props changed)
   trunk/tools/m4/convert_gtksourceviewmm.m4

Modified: trunk/gtksourceview/src/gtksourceview_enums.defs
==============================================================================
--- trunk/gtksourceview/src/gtksourceview_enums.defs	(original)
+++ trunk/gtksourceview/src/gtksourceview_enums.defs	Sat Jan 12 19:05:16 2008
@@ -1,29 +1,4 @@
-;; From /home/murrayc/svn/gnome220/gtksourceview/gtksourceview/gtksourcecontextengine.h
-
-(define-flags-extended SourceContextFlags
-  (in-module "Gtk")
-  (c-name "GtkSourceContextFlags")
-  (values
-    '("extend-parent" "GTK_SOURCE_CONTEXT_EXTEND_PARENT" "1 << 0")
-    '("end-parent" "GTK_SOURCE_CONTEXT_END_PARENT" "1 << 1")
-    '("end-at-line-end" "GTK_SOURCE_CONTEXT_END_AT_LINE_END" "1 << 2")
-    '("first-line-only" "GTK_SOURCE_CONTEXT_FIRST_LINE_ONLY" "1 << 3")
-    '("once-only" "GTK_SOURCE_CONTEXT_ONCE_ONLY" "1 << 4")
-    '("style-inside" "GTK_SOURCE_CONTEXT_STYLE_INSIDE" "1 << 5")
-  )
-)
-
-(define-flags-extended SourceContextRefOptions
-  (in-module "Gtk")
-  (c-name "GtkSourceContextRefOptions")
-  (values
-    '("ignore-style" "GTK_SOURCE_CONTEXT_IGNORE_STYLE" "1 << 0")
-    '("override-style" "GTK_SOURCE_CONTEXT_OVERRIDE_STYLE" "1 << 1")
-    '("ref-original" "GTK_SOURCE_CONTEXT_REF_ORIGINAL" "1 << 2")
-  )
-)
-
-;; From /home/murrayc/svn/gnome220/gtksourceview/gtksourceview/gtksourceiter.h
+;; From /opt/gnome2/include/gtksourceview-2.0/gtksourceview/gtksourceiter.h
 
 (define-flags-extended SourceSearchFlags
   (in-module "Gtk")
@@ -35,7 +10,7 @@
   )
 )
 
-;; From /home/murrayc/svn/gnome220/gtksourceview/gtksourceview/gtksourceview.h
+;; From /opt/gnome2/include/gtksourceview-2.0/gtksourceview/gtksourceview.h
 
 (define-enum-extended SourceSmartHomeEndType
   (in-module "Gtk")

Modified: trunk/gtksourceview/src/gtksourceview_methods.defs
==============================================================================
--- trunk/gtksourceview/src/gtksourceview_methods.defs	(original)
+++ trunk/gtksourceview/src/gtksourceview_methods.defs	Sat Jan 12 19:05:16 2008
@@ -7,20 +7,6 @@
   (gtype-id "GTK_TYPE_SOURCE_BUFFER")
 )
 
-(define-object SourceEngine
-  (in-module "Gtk")
-  (parent "GObject")
-  (c-name "GtkSourceEngine")
-  (gtype-id "GTK_TYPE_SOURCE_ENGINE")
-)
-
-(define-object SourceContextEngine
-  (in-module "Gtk")
-  (parent "GtkSourceEngine")
-  (c-name "GtkSourceContextEngine")
-  (gtype-id "GTK_TYPE_SOURCE_CONTEXT_ENGINE")
-)
-
 (define-object SourceLanguage
   (in-module "Gtk")
   (parent "GObject")
@@ -35,6 +21,13 @@
   (gtype-id "GTK_TYPE_SOURCE_LANGUAGE_MANAGER")
 )
 
+(define-object SourceMark
+  (in-module "Gtk")
+  (parent "GtkTextMark")
+  (c-name "GtkSourceMark")
+  (gtype-id "GTK_TYPE_SOURCE_MARK")
+)
+
 (define-object SourceStyleScheme
   (in-module "Gtk")
   (parent "GObject")
@@ -49,13 +42,6 @@
   (gtype-id "GTK_TYPE_SOURCE_STYLE_SCHEME_MANAGER")
 )
 
-(define-object SourceUndoManager
-  (in-module "Gtk")
-  (parent "GObject")
-  (c-name "GtkSourceUndoManager")
-  (gtype-id "GTK_TYPE_SOURCE_UNDO_MANAGER")
-)
-
 (define-object SourceView
   (in-module "Gtk")
   (parent "GtkTextView")
@@ -65,31 +51,6 @@
 
 ;; Enumerations and flags ...
 
-(define-flags SourceContextFlags
-  (in-module "Gtk")
-  (c-name "GtkSourceContextFlags")
-  (gtype-id "GTK_TYPE_SOURCE_CONTEXT_FLAGS")
-  (values
-    '("extend-parent" "GTK_SOURCE_CONTEXT_EXTEND_PARENT")
-    '("end-parent" "GTK_SOURCE_CONTEXT_END_PARENT")
-    '("end-at-line-end" "GTK_SOURCE_CONTEXT_END_AT_LINE_END")
-    '("first-line-only" "GTK_SOURCE_CONTEXT_FIRST_LINE_ONLY")
-    '("once-only" "GTK_SOURCE_CONTEXT_ONCE_ONLY")
-    '("style-inside" "GTK_SOURCE_CONTEXT_STYLE_INSIDE")
-  )
-)
-
-(define-flags SourceContextRefOptions
-  (in-module "Gtk")
-  (c-name "GtkSourceContextRefOptions")
-  (gtype-id "GTK_TYPE_SOURCE_CONTEXT_REF_OPTIONS")
-  (values
-    '("ignore-style" "GTK_SOURCE_CONTEXT_IGNORE_STYLE")
-    '("override-style" "GTK_SOURCE_CONTEXT_OVERRIDE_STYLE")
-    '("ref-original" "GTK_SOURCE_CONTEXT_REF_ORIGINAL")
-  )
-)
-
 (define-flags SourceSearchFlags
   (in-module "Gtk")
   (c-name "GtkSourceSearchFlags")
@@ -259,105 +220,70 @@
   (return-type "none")
 )
 
-(define-method create_marker
+(define-method create_mark
   (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_create_marker")
-  (return-type "GtkSourceMarker*")
+  (c-name "gtk_source_buffer_create_mark")
+  (return-type "GtkSourceMark*")
   (parameters
     '("const-gchar*" "name")
-    '("const-gchar*" "type")
-    '("const-GtkTextIter*" "where")
-  )
-)
-
-(define-method move_marker
-  (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_move_marker")
-  (return-type "none")
-  (parameters
-    '("GtkSourceMarker*" "marker")
+    '("const-gchar*" "category")
     '("const-GtkTextIter*" "where")
   )
 )
 
-(define-method delete_marker
+(define-method forward_iter_to_mark
   (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_delete_marker")
-  (return-type "none")
+  (c-name "gtk_source_buffer_forward_iter_to_mark")
+  (return-type "gboolean")
   (parameters
-    '("GtkSourceMarker*" "marker")
+    '("GtkTextIter*" "iter")
+    '("const-gchar*" "category")
   )
 )
 
-(define-method get_marker
+(define-method backward_iter_to_mark
   (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_get_marker")
-  (return-type "GtkSourceMarker*")
+  (c-name "gtk_source_buffer_backward_iter_to_mark")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "name")
+    '("GtkTextIter*" "iter")
+    '("const-gchar*" "category")
   )
 )
 
-(define-method get_markers_in_region
+(define-method get_marks_at_iter
   (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_get_markers_in_region")
+  (c-name "gtk_source_buffer_get_marks_at_iter")
   (return-type "GSList*")
   (parameters
-    '("const-GtkTextIter*" "begin")
-    '("const-GtkTextIter*" "end")
-  )
-)
-
-(define-method get_first_marker
-  (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_get_first_marker")
-  (return-type "GtkSourceMarker*")
-)
-
-(define-method get_last_marker
-  (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_get_last_marker")
-  (return-type "GtkSourceMarker*")
-)
-
-(define-method get_iter_at_marker
-  (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_get_iter_at_marker")
-  (return-type "none")
-  (parameters
     '("GtkTextIter*" "iter")
-    '("GtkSourceMarker*" "marker")
+    '("const-gchar*" "category")
   )
 )
 
-(define-method get_next_marker
+(define-method get_marks_at_line
   (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_get_next_marker")
-  (return-type "GtkSourceMarker*")
+  (c-name "gtk_source_buffer_get_marks_at_line")
+  (return-type "GSList*")
   (parameters
-    '("GtkTextIter*" "iter")
+    '("gint" "line")
+    '("const-gchar*" "category")
   )
 )
 
-(define-method get_prev_marker
+(define-method remove_marks
   (of-object "GtkSourceBuffer")
-  (c-name "gtk_source_buffer_get_prev_marker")
-  (return-type "GtkSourceMarker*")
+  (c-name "gtk_source_buffer_remove_marks")
+  (return-type "none")
   (parameters
-    '("GtkTextIter*" "iter")
+    '("GtkTextIter*" "start")
+    '("GtkTextIter*" "end")
+    '("const-gchar*" "category")
   )
 )
 
 
 
-;; From gtksourcecontextengine.h
-
-
-
-;; From gtksourceengine.h
-
-
-
 ;; From gtksourceiter.h
 
 (define-function gtk_source_iter_forward_search
@@ -495,60 +421,45 @@
 
 
 
-;; From gtksourcelanguage-private.h
-
+;; From gtksourcemark.h
 
-
-;; From gtksourcemarker.h
-
-(define-function gtk_source_marker_get_type
-  (c-name "gtk_source_marker_get_type")
+(define-function gtk_source_mark_get_type
+  (c-name "gtk_source_mark_get_type")
   (return-type "GType")
 )
 
-(define-method set_marker_type
-  (of-object "GtkSourceMarker")
-  (c-name "gtk_source_marker_set_marker_type")
-  (return-type "none")
+(define-function gtk_source_mark_new
+  (c-name "gtk_source_mark_new")
+  (is-constructor-of "GtkSourceMark")
+  (return-type "GtkSourceMark*")
   (parameters
-    '("const-gchar*" "type")
+    '("const-gchar*" "name")
+    '("const-gchar*" "category")
   )
 )
 
-(define-method get_marker_type
-  (of-object "GtkSourceMarker")
-  (c-name "gtk_source_marker_get_marker_type")
-  (return-type "gchar*")
-)
-
-(define-method get_line
-  (of-object "GtkSourceMarker")
-  (c-name "gtk_source_marker_get_line")
-  (return-type "gint")
-)
-
-(define-method get_name
-  (of-object "GtkSourceMarker")
-  (c-name "gtk_source_marker_get_name")
+(define-method get_category
+  (of-object "GtkSourceMark")
+  (c-name "gtk_source_mark_get_category")
   (return-type "const-gchar*")
 )
 
-(define-method get_buffer
-  (of-object "GtkSourceMarker")
-  (c-name "gtk_source_marker_get_buffer")
-  (return-type "gpointer")
-)
-
 (define-method next
-  (of-object "GtkSourceMarker")
-  (c-name "gtk_source_marker_next")
-  (return-type "GtkSourceMarker*")
+  (of-object "GtkSourceMark")
+  (c-name "gtk_source_mark_next")
+  (return-type "GtkSourceMark*")
+  (parameters
+    '("const-gchar*" "category")
+  )
 )
 
 (define-method prev
-  (of-object "GtkSourceMarker")
-  (c-name "gtk_source_marker_prev")
-  (return-type "GtkSourceMarker*")
+  (of-object "GtkSourceMark")
+  (c-name "gtk_source_mark_prev")
+  (return-type "GtkSourceMark*")
+  (parameters
+    '("const-gchar*" "category")
+  )
 )
 
 
@@ -568,10 +479,6 @@
 
 
 
-;; From gtksourcestyle-private.h
-
-
-
 ;; From gtksourcestylescheme.h
 
 (define-function gtk_source_style_scheme_get_type
@@ -676,75 +583,6 @@
 
 
 
-;; From gtksourceundomanager.h
-
-(define-function gtk_source_undo_manager_get_type
-  (c-name "gtk_source_undo_manager_get_type")
-  (return-type "GType")
-)
-
-(define-function gtk_source_undo_manager_new
-  (c-name "gtk_source_undo_manager_new")
-  (is-constructor-of "GtkSourceUndoManager")
-  (return-type "GtkSourceUndoManager*")
-  (parameters
-    '("GtkTextBuffer*" "buffer")
-  )
-)
-
-(define-method can_undo
-  (of-object "GtkSourceUndoManager")
-  (c-name "gtk_source_undo_manager_can_undo")
-  (return-type "gboolean")
-)
-
-(define-method can_redo
-  (of-object "GtkSourceUndoManager")
-  (c-name "gtk_source_undo_manager_can_redo")
-  (return-type "gboolean")
-)
-
-(define-method undo
-  (of-object "GtkSourceUndoManager")
-  (c-name "gtk_source_undo_manager_undo")
-  (return-type "none")
-)
-
-(define-method redo
-  (of-object "GtkSourceUndoManager")
-  (c-name "gtk_source_undo_manager_redo")
-  (return-type "none")
-)
-
-(define-method begin_not_undoable_action
-  (of-object "GtkSourceUndoManager")
-  (c-name "gtk_source_undo_manager_begin_not_undoable_action")
-  (return-type "none")
-)
-
-(define-method end_not_undoable_action
-  (of-object "GtkSourceUndoManager")
-  (c-name "gtk_source_undo_manager_end_not_undoable_action")
-  (return-type "none")
-)
-
-(define-method get_max_undo_levels
-  (of-object "GtkSourceUndoManager")
-  (c-name "gtk_source_undo_manager_get_max_undo_levels")
-  (return-type "gint")
-)
-
-(define-method set_max_undo_levels
-  (of-object "GtkSourceUndoManager")
-  (c-name "gtk_source_undo_manager_set_max_undo_levels")
-  (return-type "none")
-  (parameters
-    '("gint" "undo_levels")
-  )
-)
-
-
-
 ;; From gtksourceview.h
 
 (define-function gtk_source_view_get_type
@@ -781,21 +619,6 @@
   (return-type "gboolean")
 )
 
-(define-method set_show_line_markers
-  (of-object "GtkSourceView")
-  (c-name "gtk_source_view_set_show_line_markers")
-  (return-type "none")
-  (parameters
-    '("gboolean" "show")
-  )
-)
-
-(define-method get_show_line_markers
-  (of-object "GtkSourceView")
-  (c-name "gtk_source_view_get_show_line_markers")
-  (return-type "gboolean")
-)
-
 (define-method set_tab_width
   (of-object "GtkSourceView")
   (c-name "gtk_source_view_set_tab_width")
@@ -916,176 +739,81 @@
   (return-type "guint")
 )
 
-(define-method set_marker_pixbuf
+(define-method set_show_line_marks
   (of-object "GtkSourceView")
-  (c-name "gtk_source_view_set_marker_pixbuf")
+  (c-name "gtk_source_view_set_show_line_marks")
   (return-type "none")
   (parameters
-    '("const-gchar*" "marker_type")
-    '("GdkPixbuf*" "pixbuf")
+    '("gboolean" "show")
   )
 )
 
-(define-method get_marker_pixbuf
+(define-method get_show_line_marks
   (of-object "GtkSourceView")
-  (c-name "gtk_source_view_get_marker_pixbuf")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-gchar*" "marker_type")
-  )
+  (c-name "gtk_source_view_get_show_line_marks")
+  (return-type "gboolean")
 )
 
-(define-method set_smart_home_end
+(define-method set_mark_category_pixbuf
   (of-object "GtkSourceView")
-  (c-name "gtk_source_view_set_smart_home_end")
+  (c-name "gtk_source_view_set_mark_category_pixbuf")
   (return-type "none")
   (parameters
-    '("GtkSourceSmartHomeEndType" "smart_he")
+    '("const-gchar*" "category")
+    '("GdkPixbuf*" "pixbuf")
   )
 )
 
-(define-method get_smart_home_end
+(define-method get_mark_category_pixbuf
   (of-object "GtkSourceView")
-  (c-name "gtk_source_view_get_smart_home_end")
-  (return-type "GtkSourceSmartHomeEndType")
-)
-
-
-
-;; From gtksourceview-i18n.h
-
-
-
-;; From gtksourceview-marshal.h
-
-
-
-;; From gtksourceview-typebuiltins.h
-
-(define-function gtk_source_search_flags_get_type
-  (c-name "gtk_source_search_flags_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gtksourceview-utils.h
-
-
-
-;; From gtktextregion.h
-
-(define-function gtk_text_region_new
-  (c-name "gtk_text_region_new")
-  (is-constructor-of "GtkTextRegion")
-  (return-type "GtkTextRegion*")
-  (parameters
-    '("GtkTextBuffer*" "buffer")
-  )
-)
-
-(define-method destroy
-  (of-object "GtkTextRegion")
-  (c-name "gtk_text_region_destroy")
-  (return-type "none")
-  (parameters
-    '("gboolean" "delete_marks")
-  )
-)
-
-(define-method get_buffer
-  (of-object "GtkTextRegion")
-  (c-name "gtk_text_region_get_buffer")
-  (return-type "GtkTextBuffer*")
-)
-
-(define-method add
-  (of-object "GtkTextRegion")
-  (c-name "gtk_text_region_add")
-  (return-type "none")
+  (c-name "gtk_source_view_get_mark_category_pixbuf")
+  (return-type "GdkPixbuf*")
   (parameters
-    '("const-GtkTextIter*" "_start")
-    '("const-GtkTextIter*" "_end")
+    '("const-gchar*" "category")
   )
 )
 
-(define-method subtract
-  (of-object "GtkTextRegion")
-  (c-name "gtk_text_region_subtract")
+(define-method set_mark_category_priority
+  (of-object "GtkSourceView")
+  (c-name "gtk_source_view_set_mark_category_priority")
   (return-type "none")
   (parameters
-    '("const-GtkTextIter*" "_start")
-    '("const-GtkTextIter*" "_end")
+    '("const-gchar*" "category")
+    '("gint" "priority")
   )
 )
 
-(define-method subregions
-  (of-object "GtkTextRegion")
-  (c-name "gtk_text_region_subregions")
+(define-method get_mark_category_priority
+  (of-object "GtkSourceView")
+  (c-name "gtk_source_view_get_mark_category_priority")
   (return-type "gint")
-)
-
-(define-method nth_subregion
-  (of-object "GtkTextRegion")
-  (c-name "gtk_text_region_nth_subregion")
-  (return-type "gboolean")
-  (parameters
-    '("guint" "subregion")
-    '("GtkTextIter*" "start")
-    '("GtkTextIter*" "end")
-  )
-)
-
-(define-method intersect
-  (of-object "GtkTextRegion")
-  (c-name "gtk_text_region_intersect")
-  (return-type "GtkTextRegion*")
   (parameters
-    '("const-GtkTextIter*" "_start")
-    '("const-GtkTextIter*" "_end")
+    '("const-gchar*" "category")
   )
 )
 
-(define-method get_iterator
-  (of-object "GtkTextRegion")
-  (c-name "gtk_text_region_get_iterator")
+(define-method set_smart_home_end
+  (of-object "GtkSourceView")
+  (c-name "gtk_source_view_set_smart_home_end")
   (return-type "none")
   (parameters
-    '("GtkTextRegionIterator*" "iter")
-    '("guint" "start")
+    '("GtkSourceSmartHomeEndType" "smart_he")
   )
 )
 
-(define-method is_end
-  (of-object "GtkTextRegionIterator")
-  (c-name "gtk_text_region_iterator_is_end")
-  (return-type "gboolean")
-)
-
-(define-method next
-  (of-object "GtkTextRegionIterator")
-  (c-name "gtk_text_region_iterator_next")
-  (return-type "gboolean")
-)
-
-(define-method get_subregion
-  (of-object "GtkTextRegionIterator")
-  (c-name "gtk_text_region_iterator_get_subregion")
-  (return-type "none")
-  (parameters
-    '("GtkTextIter*" "start")
-    '("GtkTextIter*" "end")
-  )
+(define-method get_smart_home_end
+  (of-object "GtkSourceView")
+  (c-name "gtk_source_view_get_smart_home_end")
+  (return-type "GtkSourceSmartHomeEndType")
 )
 
-(define-method debug_print
-  (of-object "GtkTextRegion")
-  (c-name "gtk_text_region_debug_print")
-  (return-type "none")
-)
 
 
+;; From gtksourceview-typebuiltins.h
 
-;; From stamp-gtksourceview-typebuiltins.h
+(define-function gtk_source_search_flags_get_type
+  (c-name "gtk_source_search_flags_get_type")
+  (return-type "GType")
+)
 
 

Modified: trunk/gtksourceview/src/gtksourceview_signals.defs
==============================================================================
--- trunk/gtksourceview/src/gtksourceview_signals.defs	(original)
+++ trunk/gtksourceview/src/gtksourceview_signals.defs	Sat Jan 12 19:05:16 2008
@@ -10,12 +10,12 @@
   )
 )
 
-(define-signal marker-updated
+(define-signal source-mark-updated
   (of-object "GtkSourceBuffer")
   (return-type "void")
   (when "last")
   (parameters
-    '("GtkTextIter*" "p0")
+    '("GtkTextMark*" "p0")
   )
 )
 
@@ -138,10 +138,10 @@
 
 ;; From GtkSourceLanguage
 
-(define-property name
+(define-property section
   (of-object "GtkSourceLanguage")
   (prop-type "GParamString")
-  (docs "Language name")
+  (docs "Language section")
   (readable #t)
   (writable #f)
   (construct-only #f)
@@ -156,10 +156,10 @@
   (construct-only #f)
 )
 
-(define-property section
+(define-property name
   (of-object "GtkSourceLanguage")
   (prop-type "GParamString")
-  (docs "Language section")
+  (docs "Language name")
   (readable #t)
   (writable #f)
   (construct-only #f)
@@ -194,10 +194,10 @@
   (construct-only #f)
 )
 
-;; From GtkTextMark
+;; From GtkSourceMark
 
 (define-property name
-  (of-object "GtkTextMark")
+  (of-object "GtkSourceMark")
   (prop-type "GParamString")
   (docs "Mark name")
   (readable #t)
@@ -206,7 +206,7 @@
 )
 
 (define-property left-gravity
-  (of-object "GtkTextMark")
+  (of-object "GtkSourceMark")
   (prop-type "GParamBoolean")
   (docs "Whether the mark has left gravity")
   (readable #t)
@@ -214,6 +214,201 @@
   (construct-only #t)
 )
 
+(define-property category
+  (of-object "GtkSourceMark")
+  (prop-type "GParamString")
+  (docs "The mark category")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+;; From GtkSourceStyle
+
+(define-property line-background
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamString")
+  (docs "Line background color")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property line-background-set
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamBoolean")
+  (docs "Whether line background color is set")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property background
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamString")
+  (docs "Background color")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property background-set
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamBoolean")
+  (docs "Whether background color is set")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property foreground
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamString")
+  (docs "Foreground color")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property foreground-set
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamBoolean")
+  (docs "Whether foreground color is set")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property bold
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamBoolean")
+  (docs "Bold")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property bold-set
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamBoolean")
+  (docs "Whether bold attribute is set")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property italic
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamBoolean")
+  (docs "Italic")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property italic-set
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamBoolean")
+  (docs "Whether italic attribute is set")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property underline
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamBoolean")
+  (docs "Underline")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property underline-set
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamBoolean")
+  (docs "Whether underline attribute is set")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property strikethrough
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamBoolean")
+  (docs "Strikethrough")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property strikethrough-set
+  (of-object "GtkSourceStyle")
+  (prop-type "GParamBoolean")
+  (docs "Whether strikethrough attribute is set")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+;; From GtkSourceStyleScheme
+
+(define-property id
+  (of-object "GtkSourceStyleScheme")
+  (prop-type "GParamString")
+  (docs "Style scheme id")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property description
+  (of-object "GtkSourceStyleScheme")
+  (prop-type "GParamString")
+  (docs "Style scheme description")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property name
+  (of-object "GtkSourceStyleScheme")
+  (prop-type "GParamString")
+  (docs "Style scheme name")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property filename
+  (of-object "GtkSourceStyleScheme")
+  (prop-type "GParamString")
+  (docs "Style scheme filename")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+;; From GtkSourceStyleSchemeManager
+
+(define-property search-path
+  (of-object "GtkSourceStyleSchemeManager")
+  (prop-type "GParamBoxed")
+  (docs "List of directories and files where the style schemes are located")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property scheme-ids
+  (of-object "GtkSourceStyleSchemeManager")
+  (prop-type "GParamBoxed")
+  (docs "List of the ids of the available style schemes")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
 ;; From GtkSourceView
 
 (define-signal undo
@@ -588,10 +783,10 @@
   (construct-only #f)
 )
 
-(define-property show-line-markers
+(define-property show-line-marks
   (of-object "GtkSourceView")
   (prop-type "GParamBoolean")
-  (docs "Whether to display line marker pixbufs")
+  (docs "Whether to display line mark pixbufs")
   (readable #t)
   (writable #t)
   (construct-only #f)

Modified: trunk/gtksourceview/src/sourcebuffer.hg
==============================================================================
--- trunk/gtksourceview/src/sourcebuffer.hg	(original)
+++ trunk/gtksourceview/src/sourcebuffer.hg	Sat Jan 12 19:05:16 2008
@@ -74,15 +74,15 @@
    /// \brief Determines whether bracket match highlighting is activated for the source buffer.
    ///
    /// \return true if the source buffer will highlight  matching brackets, false otherwise.
-  _WRAP_METHOD(bool get_check_brackets() const, gtk_source_buffer_get_check_brackets)
+  _WRAP_METHOD(bool get_highlight_matching_brackets() const, gtk_source_buffer_get_highlight_matching_brackets)
 
    /// \brief controls the bracket match highlighting function in the buffer.
    ///
    /// If activated, when you position your cursor over a bracket character (a parenthesis, a square bracket, etc.)
    /// the matching opening or closing bracket character will be highlighted.
    /// You can specify the style with the SourceBuffer::set_bracket_match_style() function.
-   /// \param check_brackets true if you want matching brackets highlighted.
-  _WRAP_METHOD(void set_check_brackets(bool check_brackets=true), gtk_source_buffer_set_check_brackets)
+   /// \param highlight true if you want matching brackets highlighted.
+  _WRAP_METHOD(void set_highlight_matching_brackets(bool highlight=true), gtk_source_buffer_set_highlight_matching_brackets)
 
   /// \brief Determines whether text highlighting is activated in the source buffer.
   ///
@@ -198,6 +198,19 @@
   /// the list of undo actions is cleared and the undo manager is re-enabled.
   _WRAP_METHOD(void end_not_undoable_action(), gtk_source_buffer_end_not_undoable_action)
 
+  _WRAP_METHOD(bool backward_iter_to_mark(Gtk::TextIter& iter, const Glib::ustring& category), gtk_source_buffer_backward_iter_to_mark)
+  // overload with category == NULL
+  //_WRAP_METHOD(bool backward_iter_to_mark(Gtk::TextIter& iter), gtk_source_buffer_backward_iter_to_mark)
+
+  _WRAP_METHOD(bool forward_iter_to_mark(Gtk::TextIter& iter, const Glib::ustring& category), gtk_source_buffer_forward_iter_to_mark)
+  // overload with category == NULL
+  //_WRAP_METHOD(bool forward_iter_to_mark(Gtk::TextIter& iter), gtk_source_buffer_forward_iter_to_mark)
+
+  _WRAP_METHOD(void ensure_highlight(const Gtk::TextIter& start, const Gtk::TextIter& end), gtk_source_buffer_ensure_highlight)
+  _WRAP_METHOD(void set_style_scheme(const Glib::RefPtr<SourceStyleScheme>& scheme), gtk_source_buffer_set_style_scheme)
+  _WRAP_METHOD(Glib::RefPtr<SourceStyleScheme> get_style_scheme(), gtk_source_buffer_get_style_scheme, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const SourceStyleScheme> get_style_scheme() const, gtk_source_buffer_get_style_scheme, constversion, refreturn)
+
 
   /// \name signals
   /// @{

Modified: trunk/gtksourceview/src/sourcelanguage.hg
==============================================================================
--- trunk/gtksourceview/src/sourcelanguage.hg	(original)
+++ trunk/gtksourceview/src/sourcelanguage.hg	Sat Jan 12 19:05:16 2008
@@ -75,7 +75,7 @@
   /// \brief Whether the language should be hidden from the user.
   ///
   /// \return true if the language should be hidden, false otherwise.
-  _WRAP_METHOD(gboolean get_hidden() const, gtk_source_language_get_boolean)
+  _WRAP_METHOD(gboolean get_hidden() const, gtk_source_language_get_hidden)
 
 #m4 _CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3)')
   /// \brief gets the list of mime types for the given language.
@@ -83,8 +83,11 @@
   /// After usage you should free each element of the list as well as the list itself.
   /// \return the list of  mime types for the given language.
   _WRAP_METHOD(Glib::StringArrayHandle get_mime_types() const, gtk_source_language_get_mime_types)
+  _WRAP_METHOD(Glib::StringArrayHandle get_globs() const, gtk_source_language_get_globs)
+  _WRAP_METHOD(Glib::StringArrayHandle get_style_ids() const, gtk_source_language_get_style_ids)
 
   _WRAP_METHOD(Glib::ustring get_style_name(const Glib::ustring& style_id) const, gtk_source_language_get_style_name)
+  _WRAP_METHOD(Glib::ustring get_metadata(const Glib::ustring& name) const, gtk_source_language_get_metadata)
 };
 
 } /* namespace gtksourceview */

Modified: trunk/gtksourceview/src/sourceview.hg
==============================================================================
--- trunk/gtksourceview/src/sourceview.hg	(original)
+++ trunk/gtksourceview/src/sourceview.hg	Sat Jan 12 19:05:16 2008
@@ -152,6 +152,17 @@
   /// \return true if HOME and END keys will move to the first/last non space character of the line before moving to the start/end, false otherwise
   _WRAP_METHOD(SourceSmartHomeEndType get_smart_home_end() const, gtk_source_view_get_smart_home_end)
 
+  _WRAP_METHOD(void set_show_line_marks(bool show = true), gtk_source_view_set_show_line_marks)
+  _WRAP_METHOD(bool get_show_line_marks() const, gtk_source_view_get_show_line_marks)
+  _WRAP_METHOD(void set_indent_on_tab(bool show = true), gtk_source_view_set_indent_on_tab)
+  _WRAP_METHOD(bool get_indent_on_tab() const, gtk_source_view_get_indent_on_tab)
+  _WRAP_METHOD(void set_indent_width(gint width), gtk_source_view_set_indent_width)
+  _WRAP_METHOD(gint get_indent_width() const, gtk_source_view_get_indent_width)
+  _WRAP_METHOD(void set_mark_category_priority(const Glib::ustring& category, gint priority), gtk_source_view_set_mark_category_priority)
+  _WRAP_METHOD(gint get_mark_category_priority(const Glib::ustring& category) const, gtk_source_view_get_mark_category_priority)
+  _WRAP_METHOD(void set_mark_category_pixbuf(const Glib::ustring& category, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_source_view_set_mark_category_pixbuf)
+  _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_mark_category_pixbuf(const Glib::ustring& category) const, gtk_source_view_get_mark_category_pixbuf)
+
   _WRAP_SIGNAL(void redo(), "redo")
 
   _WRAP_SIGNAL(void undo(), "undo")

Modified: trunk/tools/extra_defs_gen/generate_defs_gtk.cc
==============================================================================
--- trunk/tools/extra_defs_gen/generate_defs_gtk.cc	(original)
+++ trunk/tools/extra_defs_gen/generate_defs_gtk.cc	Sat Jan 12 19:05:16 2008
@@ -25,7 +25,10 @@
 #include <gtksourceview/gtksourceiter.h>
 #include <gtksourceview/gtksourcelanguage.h>
 #include <gtksourceview/gtksourcelanguagemanager.h>
+#include <gtksourceview/gtksourcemark.h>
+#include <gtksourceview/gtksourcestyle.h>
 #include <gtksourceview/gtksourcestylescheme.h>
+#include <gtksourceview/gtksourcestyleschememanager.h>
 #include <gtksourceview/gtksourceview.h>
 #include <gtksourceview/gtksourceview-typebuiltins.h>
 
@@ -36,7 +39,10 @@
   std::cout << get_defs ( GTK_TYPE_SOURCE_BUFFER )
 	        << get_defs ( GTK_TYPE_SOURCE_LANGUAGE )
 	        << get_defs ( GTK_TYPE_SOURCE_LANGUAGE_MANAGER )
+	        << get_defs ( GTK_TYPE_SOURCE_MARK )
+	        << get_defs ( GTK_TYPE_SOURCE_STYLE )
 	        << get_defs ( GTK_TYPE_SOURCE_STYLE_SCHEME )
+	        << get_defs ( GTK_TYPE_SOURCE_STYLE_SCHEME_MANAGER )
 	        << get_defs ( GTK_TYPE_SOURCE_VIEW )
 	        << get_defs ( GTK_TYPE_SOURCE_SEARCH_FLAGS );
   return 0;

Modified: trunk/tools/m4/convert_gtksourceviewmm.m4
==============================================================================
--- trunk/tools/m4/convert_gtksourceviewmm.m4	(original)
+++ trunk/tools/m4/convert_gtksourceviewmm.m4	Sat Jan 12 19:05:16 2008
@@ -13,7 +13,8 @@
 #SourceStyleScheme
 _CONVERSION(`GtkSourceStyleScheme*',`Glib::RefPtr<SourceStyleScheme>',`Glib::wrap($3)')
 _CONVERSION(`GtkSourceStyleScheme*',`Glib::RefPtr<const SourceStyleScheme>',`Glib::wrap($3)')
-#_CONVERSION(`Glib::RefPtr<SourceStyleScheme>',`GtkSourceStyleScheme*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`Glib::RefPtr<SourceStyleScheme>',`GtkSourceStyleScheme*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`const Glib::RefPtr<SourceStyleScheme>&',`GtkSourceStyleScheme*',__CONVERT_REFPTR_TO_P)
 
 _CONVERSION(`GtkSourceStyle*',`Glib::RefPtr<SourceStyle>',`Glib::wrap($3)')