Author: mhutch
Date: 2007-08-28 12:35:34 -0400 (Tue, 28 Aug 2007)
New Revision: 84962
Removed:
trunk/gtksourceview2-sharp/gtksourceview/Global.custom
trunk/gtksourceview2-sharp/gtksourceview/SourceLanguageManager.custom
trunk/gtksourceview2-sharp/gtksourceview/SourceLanguagesManager.custom
trunk/gtksourceview2-sharp/gtksourceview/SourceStyleScheme.custom
trunk/gtksourceview2-sharp/gtksourceview/SourceTagTable.custom
Modified:
trunk/gtksourceview2-sharp/ChangeLog
trunk/gtksourceview2-sharp/configure.in
trunk/gtksourceview2-sharp/gtksourceview/Gtk.metadata
trunk/gtksourceview2-sharp/gtksourceview/Makefile.am
trunk/gtksourceview2-sharp/gtksourceview/gtksourceview2-api.raw
trunk/gtksourceview2-sharp/sample/SourceViewTest.cs
trunk/gtksourceview2-sharp/sources/
trunk/gtksourceview2-sharp/sources/gtksourceview2-sharp-sources.xml
trunk/gtksourceview2-sharp/sources/makefile
Log:
2007-08-28 Michael Hutchinson <[EMAIL PROTECTED]>
* sources/makefile,
sources/gtksourceview2-sharp-sources.xml,
gtksourceview/gtksourceview2-api.raw,
configure.in: Updated GtkSourceView version to 1.90.4.
* sample/SourceViewTest.cs,
gtksourceview/Gtk.metadata: Updated to 1.90.4 API.
* gtksourceview/Makefile.am: Updated.
* gtksourceview/SourceStyleScheme.custom,
gtksourceview/SourceLanguagesManager.custom,
gtksourceview/SourceLanguageManager.custom,
gtksourceview/SourceTagTable.custom,
gtksourceview/Global.custom: Removed, not used in 1.90.4.
Modified: trunk/gtksourceview2-sharp/ChangeLog
===================================================================
--- trunk/gtksourceview2-sharp/ChangeLog 2007-08-28 15:18:41 UTC (rev
84961)
+++ trunk/gtksourceview2-sharp/ChangeLog 2007-08-28 16:35:34 UTC (rev
84962)
@@ -1,5 +1,23 @@
2007-08-28 Michael Hutchinson <[EMAIL PROTECTED]>
+ * sources/makefile,
+ sources/gtksourceview2-sharp-sources.xml,
+ gtksourceview/gtksourceview2-api.raw,
+ configure.in: Updated GtkSourceView version to 1.90.4.
+
+ * sample/SourceViewTest.cs,
+ gtksourceview/Gtk.metadata: Updated to 1.90.4 API.
+
+ * gtksourceview/Makefile.am: Updated.
+
+ * gtksourceview/SourceStyleScheme.custom,
+ gtksourceview/SourceLanguagesManager.custom,
+ gtksourceview/SourceLanguageManager.custom,
+ gtksourceview/SourceTagTable.custom,
+ gtksourceview/Global.custom: Removed, not used in 1.90.4.
+
+2007-08-28 Michael Hutchinson <[EMAIL PROTECTED]>
+
* gtksourceview/gtksourceview2-api.raw,
gtksourceview/Makefile.am: Some more renaming.
Modified: trunk/gtksourceview2-sharp/configure.in
===================================================================
--- trunk/gtksourceview2-sharp/configure.in 2007-08-28 15:18:41 UTC (rev
84961)
+++ trunk/gtksourceview2-sharp/configure.in 2007-08-28 16:35:34 UTC (rev
84962)
@@ -1,6 +1,6 @@
AC_INIT(README)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(gtksourceview2-sharp, 1.90.3)
+AM_INIT_AUTOMAKE(gtksourceview2-sharp, 1.90.4)
AM_MAINTAINER_MODE
dnl Defines CC to avoid warnings
@@ -69,7 +69,7 @@
gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-2.0`
AC_SUBST(gtksharp_prefix)
-PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0 >= 1.90.3)
+PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0 >= 1.90.4)
AC_SUBST(GTKSOURCEVIEW_LIBS)
gtksourceview_prefix=`pkg-config --variable=prefix gtksourceview-2.0`
AC_SUBST(gtksourceview_prefix)
@@ -110,7 +110,7 @@
AC_SUBST(MDASSEMBLER)
AC_SUBST(MONODOCER)
-API_VERSION="1.90.3"
+API_VERSION="1.90.4"
AC_SUBST(API_VERSION)
AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")
Deleted: trunk/gtksourceview2-sharp/gtksourceview/Global.custom
===================================================================
--- trunk/gtksourceview2-sharp/gtksourceview/Global.custom 2007-08-28
15:18:41 UTC (rev 84961)
+++ trunk/gtksourceview2-sharp/gtksourceview/Global.custom 2007-08-28
16:35:34 UTC (rev 84962)
@@ -1,18 +0,0 @@
-
- [DllImport("gtksourceview-2.0")]
- static extern IntPtr gtk_keyword_list_tag_new (string id,
string name, IntPtr keywords, bool case_sensitive, bool
match_empty_string_at_beginning, bool match_empty_string_at_end, string
beginning_regex, string end_regex);
-
- public static Gtk.TextTag KeywordListTagNew (string id, string
name, string[] keywords, bool case_sensitive, bool
match_empty_string_at_beginning, bool match_empty_string_at_end, string
beginning_regex, string end_regex)
- {
- GLib.SList list = new GLib.SList (typeof (string));
- foreach (string s in keywords)
- list.Append (s);
- IntPtr raw_ret = gtk_keyword_list_tag_new(id, name,
list.Handle, case_sensitive, match_empty_string_at_beginning,
match_empty_string_at_end, beginning_regex, end_regex);
- Gtk.TextTag ret;
- if (raw_ret == IntPtr.Zero)
- ret = null;
- else
- ret = (Gtk.TextTag)
GLib.Object.GetObject(raw_ret);
- return ret;
- }
-
Modified: trunk/gtksourceview2-sharp/gtksourceview/Gtk.metadata
===================================================================
--- trunk/gtksourceview2-sharp/gtksourceview/Gtk.metadata 2007-08-28
15:18:41 UTC (rev 84961)
+++ trunk/gtksourceview2-sharp/gtksourceview/Gtk.metadata 2007-08-28
16:35:34 UTC (rev 84962)
@@ -9,9 +9,7 @@
<attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceUndoManager']/[EMAIL
PROTECTED]'CanUndo']" name="name">CanUndoFired</attr>
<attr path="//namespace" name="name">GtkSourceView</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceLanguage']/[EMAIL
PROTECTED]'GetMimeTypes']" name="hidden">1</attr>
- <attr path="/api/namespace/[EMAIL
PROTECTED]'GtkSourceLanguageManager']/[EMAIL PROTECTED]'ListLanguages']"
name="hidden">1</attr>
+ <attr path="/api/namespace/[EMAIL
PROTECTED]'GtkSourceLanguageManager']/[EMAIL PROTECTED]'GetLanguageIds']"
name="hidden">1</attr>
<attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceBuffer']/[EMAIL
PROTECTED]'GetMarkersInRegion']" name="hidden">1</attr>
- <attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceStyleScheme']/[EMAIL
PROTECTED]'GetStyleNames']" name="hidden">1</attr>
- <attr path="/api/namespace/[EMAIL PROTECTED]'GtkSourceTagTable']/[EMAIL
PROTECTED]'AddTags']" name="hidden">1</attr>
- <attr path="/api/namespace/[EMAIL PROTECTED]'Global']/[EMAIL
PROTECTED]'KeywordListTagNew']" name="hidden">1</attr>
+ <attr path="/api/namespace/[EMAIL
PROTECTED]'GtkSourceStyleSchemeManager']/[EMAIL PROTECTED]'GetSchemeIds']"
name="hidden">1</attr>
</metadata>
Modified: trunk/gtksourceview2-sharp/gtksourceview/Makefile.am
===================================================================
--- trunk/gtksourceview2-sharp/gtksourceview/Makefile.am 2007-08-28
15:18:41 UTC (rev 84961)
+++ trunk/gtksourceview2-sharp/gtksourceview/Makefile.am 2007-08-28
16:35:34 UTC (rev 84962)
@@ -2,7 +2,7 @@
LIBRARY= $(LIBRARY_NAME).dll
APIS= gtksourceview2-api.xml
-ASSEMBLIES= /pkg:gnome-sharp-2.0
+ASSEMBLIES= /pkg:gnome-sharp-2.0 /r:Mono.Posix
EXTRA_DIST = $(sources) $(customs) Gtk.metadata gtksourceview2-api.raw
AssemblyInfo.cs.in
@@ -30,12 +30,8 @@
build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
customs = \
-Global.custom \
SourceBuffer.custom \
-SourceLanguage.custom \
-SourceLanguageManager.custom \
-SourceStyleScheme.custom \
-SourceTagTable.custom
+SourceLanguage.custom
build_customs = $(addprefix $(srcdir)/, $(customs))
Deleted: trunk/gtksourceview2-sharp/gtksourceview/SourceLanguageManager.custom
===================================================================
--- trunk/gtksourceview2-sharp/gtksourceview/SourceLanguageManager.custom
2007-08-28 15:18:41 UTC (rev 84961)
+++ trunk/gtksourceview2-sharp/gtksourceview/SourceLanguageManager.custom
2007-08-28 16:35:34 UTC (rev 84962)
@@ -1,15 +0,0 @@
-
- [DllImport("gtksourceview-2.0")]
- static extern IntPtr
gtk_source_language_manager_list_languages(IntPtr raw);
-
- public SourceLanguage[] AvailableLanguages {
- get {
- IntPtr raw_ret =
gtk_source_language_manager_list_languages(Handle);
- GLib.SList list = new GLib.SList(raw_ret);
- SourceLanguage[] result = new SourceLanguage
[list.Count];
- for (int i = 0; i < list.Count; i++)
- result [i] = list [i] as
SourceLanguage;
- return result;
-
- }
- }
Deleted: trunk/gtksourceview2-sharp/gtksourceview/SourceLanguagesManager.custom
===================================================================
--- trunk/gtksourceview2-sharp/gtksourceview/SourceLanguagesManager.custom
2007-08-28 15:18:41 UTC (rev 84961)
+++ trunk/gtksourceview2-sharp/gtksourceview/SourceLanguagesManager.custom
2007-08-28 16:35:34 UTC (rev 84962)
@@ -1,15 +0,0 @@
-
- [DllImport("gtksourceview-1.0")]
- static extern IntPtr
gtk_source_languages_manager_get_available_languages(IntPtr raw);
-
- public SourceLanguage[] AvailableLanguages {
- get {
- IntPtr raw_ret =
gtk_source_languages_manager_get_available_languages(Handle);
- GLib.SList list = new GLib.SList(raw_ret);
- SourceLanguage[] result = new SourceLanguage
[list.Count];
- for (int i = 0; i < list.Count; i++)
- result [i] = list [i] as
SourceLanguage;
- return result;
-
- }
- }
Deleted: trunk/gtksourceview2-sharp/gtksourceview/SourceStyleScheme.custom
===================================================================
--- trunk/gtksourceview2-sharp/gtksourceview/SourceStyleScheme.custom
2007-08-28 15:18:41 UTC (rev 84961)
+++ trunk/gtksourceview2-sharp/gtksourceview/SourceStyleScheme.custom
2007-08-28 16:35:34 UTC (rev 84962)
@@ -1 +0,0 @@
-
Deleted: trunk/gtksourceview2-sharp/gtksourceview/SourceTagTable.custom
===================================================================
--- trunk/gtksourceview2-sharp/gtksourceview/SourceTagTable.custom
2007-08-28 15:18:41 UTC (rev 84961)
+++ trunk/gtksourceview2-sharp/gtksourceview/SourceTagTable.custom
2007-08-28 16:35:34 UTC (rev 84962)
@@ -1,10 +0,0 @@
-
- [DllImport("gtksourceview-2.0")]
- static extern void gtk_source_tag_table_add_tags(IntPtr raw,
IntPtr tags);
-
- public void AddTags(SourceTag[] tags) {
- GLib.SList list = new GLib.SList (typeof (SourceTag));
- foreach (SourceTag tag in tags)
- list.Append (tag.Handle);
- gtk_source_tag_table_add_tags(Handle, list.Handle);
- }
Modified: trunk/gtksourceview2-sharp/gtksourceview/gtksourceview2-api.raw
===================================================================
--- trunk/gtksourceview2-sharp/gtksourceview/gtksourceview2-api.raw
2007-08-28 15:18:41 UTC (rev 84961)
+++ trunk/gtksourceview2-sharp/gtksourceview/gtksourceview2-api.raw
2007-08-28 16:35:34 UTC (rev 84962)
@@ -33,9 +33,9 @@
</enum>
<object name="SourceBuffer" cname="GtkSourceBuffer" parent="GtkTextBuffer">
<field name="Priv" cname="priv" type="GtkSourceBufferPrivate*" />
- <property name="CheckBrackets" cname="check_brackets" type="gboolean"
readable="true" writeable="true" />
- <property name="Highlight" cname="highlight" type="gboolean"
readable="true" writeable="true" />
- <property name="MaxUndoLevels" cname="max_undo_levels" type="gint"
readable="true" writeable="true" />
+ <property name="HighlightSyntax" cname="highlight-syntax"
type="gboolean" readable="true" writeable="true" />
+ <property name="HighlightMatchingBrackets"
cname="highlight-matching-brackets" type="gboolean" readable="true"
writeable="true" />
+ <property name="MaxUndoLevels" cname="max-undo-levels" type="gint"
readable="true" writeable="true" />
<property name="Language" cname="language" type="GtkSourceLanguage"
readable="true" writeable="true" />
<property name="CanUndo" cname="can-undo" type="gboolean"
readable="true" />
<property name="CanRedo" cname="can-redo" type="gboolean"
readable="true" />
@@ -88,15 +88,15 @@
<parameter type="const-GtkTextIter*" name="end" />
</parameters>
</method>
- <method name="GetCheckBrackets"
cname="gtk_source_buffer_get_check_brackets">
- <return-type type="gboolean" />
- </method>
<method name="GetFirstMarker" cname="gtk_source_buffer_get_first_marker">
<return-type type="GtkSourceMarker*" />
</method>
- <method name="GetHighlight" cname="gtk_source_buffer_get_highlight">
+ <method name="GetHighlightMatchingBrackets"
cname="gtk_source_buffer_get_highlight_matching_brackets">
<return-type type="gboolean" />
</method>
+ <method name="GetHighlightSyntax"
cname="gtk_source_buffer_get_highlight_syntax">
+ <return-type type="gboolean" />
+ </method>
<method name="GetIterAtMarker"
cname="gtk_source_buffer_get_iter_at_marker">
<return-type type="void" />
<parameters>
@@ -164,13 +164,13 @@
<method name="Redo" cname="gtk_source_buffer_redo">
<return-type type="void" />
</method>
- <method name="SetCheckBrackets"
cname="gtk_source_buffer_set_check_brackets">
+ <method name="SetHighlightMatchingBrackets"
cname="gtk_source_buffer_set_highlight_matching_brackets">
<return-type type="void" />
<parameters>
- <parameter type="gboolean" name="check_brackets" />
+ <parameter type="gboolean" name="highlight" />
</parameters>
</method>
- <method name="SetHighlight" cname="gtk_source_buffer_set_highlight">
+ <method name="SetHighlightSyntax"
cname="gtk_source_buffer_set_highlight_syntax">
<return-type type="void" />
<parameters>
<parameter type="gboolean" name="highlight" />
@@ -288,24 +288,25 @@
<object name="SourceLanguageManager" cname="GtkSourceLanguageManager"
parent="GObject">
<field name="Priv" cname="priv" type="GtkSourceLanguageManagerPrivate*"
/>
<property name="SearchPath" cname="search-path" type="GStrv"
readable="true" writeable="true" />
+ <property name="LanguageIds" cname="language-ids" type="GStrv"
readable="true" />
<method name="GetDefault"
cname="gtk_source_language_manager_get_default" shared="true">
<return-type type="GtkSourceLanguageManager*" />
</method>
- <method name="GetLanguageById"
cname="gtk_source_language_manager_get_language_by_id">
+ <method name="GetLanguage"
cname="gtk_source_language_manager_get_language">
<return-type type="GtkSourceLanguage*" />
<parameters>
<parameter type="const-gchar*" name="id" />
</parameters>
</method>
+ <method name="GetLanguageIds"
cname="gtk_source_language_manager_get_language_ids">
+ <return-type type="const-gchar**" />
+ </method>
<method name="GetSearchPath"
cname="gtk_source_language_manager_get_search_path">
- <return-type type="gchar**" />
+ <return-type type="const-gchar**" />
</method>
<method name="GetType" cname="gtk_source_language_manager_get_type"
shared="true">
<return-type type="GType" />
</method>
- <method name="ListLanguages"
cname="gtk_source_language_manager_list_languages">
- <return-type type="GSList*" />
- </method>
<constructor cname="gtk_source_language_manager_new" />
<method name="SetSearchPath"
cname="gtk_source_language_manager_set_search_path">
<return-type type="void" />
@@ -344,12 +345,14 @@
</method>
</object>
<object name="SourceStyle" cname="GtkSourceStyle" parent="GObject">
+ <property name="LineBackground" cname="line-background" type="gchar*"
readable="true" writeable="true" construct-only="true" />
<property name="Background" cname="background" type="gchar*"
readable="true" writeable="true" construct-only="true" />
<property name="Foreground" cname="foreground" type="gchar*"
readable="true" writeable="true" construct-only="true" />
<property name="Bold" cname="bold" type="gboolean" readable="true"
writeable="true" construct-only="true" />
<property name="Italic" cname="italic" type="gboolean" readable="true"
writeable="true" construct-only="true" />
<property name="Underline" cname="underline" type="gboolean"
readable="true" writeable="true" construct-only="true" />
<property name="Strikethrough" cname="strikethrough" type="gboolean"
readable="true" writeable="true" construct-only="true" />
+ <property name="LineBackgroundSet" cname="line-background-set"
type="gboolean" readable="true" writeable="true" construct-only="true" />
<property name="ForegroundSet" cname="foreground-set" type="gboolean"
readable="true" writeable="true" construct-only="true" />
<property name="BackgroundSet" cname="background-set" type="gboolean"
readable="true" writeable="true" construct-only="true" />
<property name="BoldSet" cname="bold-set" type="gboolean"
readable="true" writeable="true" construct-only="true" />
@@ -363,61 +366,14 @@
<return-type type="GType" />
</method>
</object>
- <object name="SourceStyleManager" cname="GtkSourceStyleManager"
parent="GObject">
- <field name="Priv" cname="priv" type="GtkSourceStyleManagerPrivate*" />
- <property name="SearchPath" cname="search-path" type="GStrv"
readable="true" writeable="true" />
- <property name="SchemeIds" cname="scheme-ids" type="GStrv"
readable="true" />
- <method name="AppendSearchPath"
cname="gtk_source_style_manager_append_search_path">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="path" />
- </parameters>
- </method>
- <method name="ForceRescan" cname="gtk_source_style_manager_force_rescan">
- <return-type type="void" />
- </method>
- <method name="GetDefault" cname="gtk_source_style_manager_get_default"
shared="true">
- <return-type type="GtkSourceStyleManager*" />
- </method>
- <method name="GetScheme" cname="gtk_source_style_manager_get_scheme">
- <return-type type="GtkSourceStyleScheme*" />
- <parameters>
- <parameter type="const-gchar*" name="scheme_id" />
- </parameters>
- </method>
- <method name="GetSchemeIds"
cname="gtk_source_style_manager_get_scheme_ids">
- <return-type type="const-gchar**" />
- </method>
- <method name="GetSearchPath"
cname="gtk_source_style_manager_get_search_path">
- <return-type type="const-gchar**" />
- </method>
- <method name="GetType" cname="gtk_source_style_manager_get_type"
shared="true">
- <return-type type="GType" />
- </method>
- <constructor cname="gtk_source_style_manager_new" />
- <method name="PrependSearchPath"
cname="gtk_source_style_manager_prepend_search_path">
- <return-type type="void" />
- <parameters>
- <parameter type="const-gchar*" name="path" />
- </parameters>
- </method>
- <method name="SetSearchPath"
cname="gtk_source_style_manager_set_search_path">
- <return-type type="void" />
- <parameters>
- <parameter type="gchar**" name="path" />
- </parameters>
- </method>
- </object>
<object name="SourceStyleScheme" cname="GtkSourceStyleScheme"
parent="GObject">
<field name="Priv" cname="priv" type="GtkSourceStyleSchemePrivate*" />
<property name="Id" cname="id" type="gchar*" readable="true"
writeable="true" construct-only="true" />
- <property name="Name" cname="name" type="gchar*" readable="true"
writeable="true" />
+ <property name="Name" cname="name" type="gchar*" readable="true" />
+ <property name="Description" cname="description" type="gchar*"
readable="true" />
<property name="Filename" cname="filename" type="gchar*" readable="true"
/>
- <method name="GetCurrentLineColor"
cname="gtk_source_style_scheme_get_current_line_color">
- <return-type type="gboolean" />
- <parameters>
- <parameter type="GdkColor*" name="color" />
- </parameters>
+ <method name="GetAuthors" cname="gtk_source_style_scheme_get_authors">
+ <return-type type="const-gchar**" />
</method>
<method name="GetDescription"
cname="gtk_source_style_scheme_get_description">
<return-type type="const-gchar*" />
@@ -428,9 +384,6 @@
<method name="GetId" cname="gtk_source_style_scheme_get_id">
<return-type type="const-gchar*" />
</method>
- <method name="GetMatchingBracketsStyle"
cname="gtk_source_style_scheme_get_matching_brackets_style">
- <return-type type="GtkSourceStyle*" />
- </method>
<method name="GetName" cname="gtk_source_style_scheme_get_name">
<return-type type="const-gchar*" />
</method>
@@ -444,6 +397,41 @@
<return-type type="GType" />
</method>
</object>
+ <object name="SourceStyleSchemeManager"
cname="GtkSourceStyleSchemeManager" parent="GObject">
+ <field name="Priv" cname="priv"
type="GtkSourceStyleSchemeManagerPrivate*" />
+ <property name="SearchPath" cname="search-path" type="GStrv"
readable="true" writeable="true" />
+ <property name="SchemeIds" cname="scheme-ids" type="GStrv"
readable="true" />
+ <method name="AppendSearchPath"
cname="gtk_source_style_scheme_manager_append_search_path">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="const-gchar*" name="path" />
+ </parameters>
+ </method>
+ <method name="ForceRescan"
cname="gtk_source_style_scheme_manager_force_rescan">
+ <return-type type="void" />
+ </method>
+ <method name="GetScheme"
cname="gtk_source_style_scheme_manager_get_scheme">
+ <return-type type="GtkSourceStyleScheme*" />
+ <parameters>
+ <parameter type="const-gchar*" name="scheme_id" />
+ </parameters>
+ </method>
+ <method name="GetSchemeIds"
cname="gtk_source_style_scheme_manager_get_scheme_ids">
+ <return-type type="const-gchar**" />
+ </method>
+ <method name="GetSearchPath"
cname="gtk_source_style_scheme_manager_get_search_path">
+ <return-type type="const-gchar**" />
+ </method>
+ <method name="GetType" cname="gtk_source_style_scheme_manager_get_type"
shared="true">
+ <return-type type="GType" />
+ </method>
+ <method name="PrependSearchPath"
cname="gtk_source_style_scheme_manager_prepend_search_path">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="const-gchar*" name="path" />
+ </parameters>
+ </method>
+ </object>
<object name="SourceUndoManager" cname="GtkSourceUndoManager"
parent="GObject">
<field name="Priv" cname="priv" type="GtkSourceUndoManagerPrivate*" />
<signal name="CanUndo" cname="can_undo" when="LAST">
@@ -500,11 +488,12 @@
<field name="Priv" cname="priv" type="GtkSourceViewPrivate*" />
<property name="ShowLineNumbers" cname="show_line_numbers"
type="gboolean" readable="true" writeable="true" />
<property name="ShowLineMarkers" cname="show_line_markers"
type="gboolean" readable="true" writeable="true" />
- <property name="TabsWidth" cname="tabs_width" type="guint"
readable="true" writeable="true" />
+ <property name="TabWidth" cname="tab-width" type="guint" readable="true"
writeable="true" />
+ <property name="IndentWidth" cname="indent-width" type="gint"
readable="true" writeable="true" />
<property name="AutoIndent" cname="auto_indent" type="gboolean"
readable="true" writeable="true" />
<property name="InsertSpacesInsteadOfTabs"
cname="insert_spaces_instead_of_tabs" type="gboolean" readable="true"
writeable="true" />
- <property name="ShowMargin" cname="show_margin" type="gboolean"
readable="true" writeable="true" />
- <property name="Margin" cname="margin" type="guint" readable="true"
writeable="true" />
+ <property name="ShowRightMargin" cname="show-right-margin"
type="gboolean" readable="true" writeable="true" />
+ <property name="RightMarginPosition" cname="right-margin-position"
type="guint" readable="true" writeable="true" />
<property name="SmartHomeEnd" cname="smart_home_end"
type="GtkSourceSmartHomeEndType" readable="true" writeable="true" />
<property name="HighlightCurrentLine" cname="highlight_current_line"
type="gboolean" readable="true" writeable="true" />
<property name="IndentOnTab" cname="indent_on_tab" type="gboolean"
readable="true" writeable="true" />
@@ -529,31 +518,34 @@
<method name="GetIndentOnTab" cname="gtk_source_view_get_indent_on_tab">
<return-type type="gboolean" />
</method>
+ <method name="GetIndentWidth" cname="gtk_source_view_get_indent_width">
+ <return-type type="gint" />
+ </method>
<method name="GetInsertSpacesInsteadOfTabs"
cname="gtk_source_view_get_insert_spaces_instead_of_tabs">
<return-type type="gboolean" />
</method>
- <method name="GetMargin" cname="gtk_source_view_get_margin">
- <return-type type="guint" />
- </method>
<method name="GetMarkerPixbuf" cname="gtk_source_view_get_marker_pixbuf">
<return-type type="GdkPixbuf*" />
<parameters>
<parameter type="const-gchar*" name="marker_type" />
</parameters>
</method>
+ <method name="GetRightMarginPosition"
cname="gtk_source_view_get_right_margin_position">
+ <return-type type="guint" />
+ </method>
<method name="GetShowLineMarkers"
cname="gtk_source_view_get_show_line_markers">
<return-type type="gboolean" />
</method>
<method name="GetShowLineNumbers"
cname="gtk_source_view_get_show_line_numbers">
<return-type type="gboolean" />
</method>
- <method name="GetShowMargin" cname="gtk_source_view_get_show_margin">
+ <method name="GetShowRightMargin"
cname="gtk_source_view_get_show_right_margin">
<return-type type="gboolean" />
</method>
<method name="GetSmartHomeEnd"
cname="gtk_source_view_get_smart_home_end">
<return-type type="GtkSourceSmartHomeEndType" />
</method>
- <method name="GetTabsWidth" cname="gtk_source_view_get_tabs_width">
+ <method name="GetTabWidth" cname="gtk_source_view_get_tab_width">
<return-type type="guint" />
</method>
<method name="GetType" cname="gtk_source_view_get_type" shared="true">
@@ -583,16 +575,16 @@
<parameter type="gboolean" name="enable" />
</parameters>
</method>
- <method name="SetInsertSpacesInsteadOfTabs"
cname="gtk_source_view_set_insert_spaces_instead_of_tabs">
+ <method name="SetIndentWidth" cname="gtk_source_view_set_indent_width">
<return-type type="void" />
<parameters>
- <parameter type="gboolean" name="enable" />
+ <parameter type="gint" name="width" />
</parameters>
</method>
- <method name="SetMargin" cname="gtk_source_view_set_margin">
+ <method name="SetInsertSpacesInsteadOfTabs"
cname="gtk_source_view_set_insert_spaces_instead_of_tabs">
<return-type type="void" />
<parameters>
- <parameter type="guint" name="margin" />
+ <parameter type="gboolean" name="enable" />
</parameters>
</method>
<method name="SetMarkerPixbuf" cname="gtk_source_view_set_marker_pixbuf">
@@ -602,6 +594,12 @@
<parameter type="GdkPixbuf*" name="pixbuf" />
</parameters>
</method>
+ <method name="SetRightMarginPosition"
cname="gtk_source_view_set_right_margin_position">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="guint" name="pos" />
+ </parameters>
+ </method>
<method name="SetShowLineMarkers"
cname="gtk_source_view_set_show_line_markers">
<return-type type="void" />
<parameters>
@@ -614,7 +612,7 @@
<parameter type="gboolean" name="show" />
</parameters>
</method>
- <method name="SetShowMargin" cname="gtk_source_view_set_show_margin">
+ <method name="SetShowRightMargin"
cname="gtk_source_view_set_show_right_margin">
<return-type type="void" />
<parameters>
<parameter type="gboolean" name="show" />
@@ -626,7 +624,7 @@
<parameter type="GtkSourceSmartHomeEndType" name="smart_he" />
</parameters>
</method>
- <method name="SetTabsWidth" cname="gtk_source_view_set_tabs_width">
+ <method name="SetTabWidth" cname="gtk_source_view_set_tab_width">
<return-type type="void" />
<parameters>
<parameter type="guint" name="width" />
Modified: trunk/gtksourceview2-sharp/sample/SourceViewTest.cs
===================================================================
--- trunk/gtksourceview2-sharp/sample/SourceViewTest.cs 2007-08-28 15:18:41 UTC
(rev 84961)
+++ trunk/gtksourceview2-sharp/sample/SourceViewTest.cs 2007-08-28 16:35:34 UTC
(rev 84962)
@@ -20,7 +20,7 @@
}
string lang = (args.Length > 1)? args[1] : "c-sharp";
- language = SourceLanguageManager.Default.GetLanguageById (lang);
+ language = SourceLanguageManager.Default.GetLanguage (lang);
if (language == null) {
Console.WriteLine ("Invalid language ID: {0}", lang);
return;
@@ -37,6 +37,10 @@
static void PrintUsage ()
{
Console.WriteLine ("Usage: SourceViewTest.exe filename
[language]");
+ Console.WriteLine ("\nAvailable languages:");
+ foreach (string lang in
SourceLanguageManager.Default.LanguageIds)
+ Console.WriteLine ("\t{0}", lang);
+ Console.WriteLine ();
Environment.Exit (0);
}
@@ -61,7 +65,8 @@
SourceBuffer CreateBuffer ()
{
SourceBuffer buffer = new SourceBuffer (language);
- buffer.Highlight = true;
+ buffer.HighlightSyntax = true;
+ buffer.HighlightMatchingBrackets = true;
StreamReader sr = File.OpenText (filename);
buffer.Text = sr.ReadToEnd ();
sr.Close ();
Property changes on: trunk/gtksourceview2-sharp/sources
___________________________________________________________________
Name: svn:ignore
- gtksourceview-1.90.3
+ gtksourceview-1.90.4
Modified: trunk/gtksourceview2-sharp/sources/gtksourceview2-sharp-sources.xml
===================================================================
--- trunk/gtksourceview2-sharp/sources/gtksourceview2-sharp-sources.xml
2007-08-28 15:18:41 UTC (rev 84961)
+++ trunk/gtksourceview2-sharp/sources/gtksourceview2-sharp-sources.xml
2007-08-28 16:35:34 UTC (rev 84962)
@@ -1,8 +1,8 @@
<gapi-parser-input>
- <api filename="../gtksourceview/gtksourceview-api.raw">
+ <api filename="../gtksourceview/gtksourceview2-api.raw">
<library name="gtksourceview-2.0">
<namespace name="Gtk">
- <dir>gtksourceview-1.90.3/gtksourceview</dir>
+ <dir>gtksourceview-1.90.4/gtksourceview</dir>
</namespace>
</library>
</api>
Modified: trunk/gtksourceview2-sharp/sources/makefile
===================================================================
--- trunk/gtksourceview2-sharp/sources/makefile 2007-08-28 15:18:41 UTC (rev
84961)
+++ trunk/gtksourceview2-sharp/sources/makefile 2007-08-28 16:35:34 UTC (rev
84962)
@@ -2,5 +2,5 @@
gapi2-parser gtksourceview2-sharp-sources.xml
get-source-code:
- wget
http://ftp.gnome.org/pub/gnome/sources/gtksourceview/1.90/gtksourceview-1.90.3.tar.gz
--output-document=- | tar -xz;
+ wget
http://ftp.gnome.org/pub/gnome/sources/gtksourceview/1.90/gtksourceview-1.90.4.tar.gz
--output-document=- | tar -xz;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches