[Monodevelop-patches-list] r1972 - in trunk/MonoDevelop/Core: . src/AddIns/DisplayBindings/SourceEditor src/AddIns/DisplayBindings/SourceEditor/CodeCompletion src/AddIns/DisplayBindings/SourceEditor/Gui
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Mon Oct 4 18:51:21 EDT 2004
Author: tberman
Date: 2004-10-04 18:51:21 -0400 (Mon, 04 Oct 2004)
New Revision: 1972
Modified:
trunk/MonoDevelop/Core/ChangeLog
trunk/MonoDevelop/Core/configure.in
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
Log:
yay. workaround a weird mono issue with assembly loading.
Also provide a potential point to start adding gtk-sharp-2.0 functionality.
yay.
jackson will fix this bug this weekend he says.
Modified: trunk/MonoDevelop/Core/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/ChangeLog 2004-09-26 20:07:38 UTC (rev 1971)
+++ trunk/MonoDevelop/Core/ChangeLog 2004-10-04 22:51:21 UTC (rev 1972)
@@ -1,3 +1,10 @@
+2004-10-04 Todd Berman <tberman at off.net>
+
+ * configure.in: Add a --with-gtk-sharp-2-0 to allow gtk-sharp-2-0
+ to be used. This is a needed workaround for now to allow for people
+ to get 2.0 completion info. Works around a mono bug. That jackson
+ is going to fix. :)
+
2004-09-20 Tim Gerla <tim at gerla.net>
* configure.in:
Modified: trunk/MonoDevelop/Core/configure.in
===================================================================
--- trunk/MonoDevelop/Core/configure.in 2004-09-26 20:07:38 UTC (rev 1971)
+++ trunk/MonoDevelop/Core/configure.in 2004-10-04 22:51:21 UTC (rev 1972)
@@ -66,15 +66,30 @@
fi
+GTK_SHARP_2_0=no
+
+AC_ARG_WITH(gtk-sharp-2-0, [ --with-gtk-sharp-2-0=yes,no
+ If you want to build with gtk-sharp-2.0 default=no],[
+ if test x$with_gtk_sharp_2_0 = xyes; then
+ GTK_SHARP_2_0=yes
+ fi
+])
+
dnl hard dependencies
GTKSHARP_REQUIRED_VERSION=1.0
GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.5
GECKOSHARP_REQUIRED_VERSION=0.5
MONODOC_REQUIRED_VERSION=1.0
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk-sharp >= $GTKSHARP_REQUIRED_VERSION glade-sharp >= $GTKSHARP_REQUIRED_VERSION gconf-sharp >= $GTKSHARP_REQUIRED_VERSION
-gnome-sharp >= $GTKSHARP_REQUIRED_VERSION gtkhtml-sharp >= $GTKSHARP_REQUIRED_VERSION gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION monodoc >= $MONODOC_REQUIRED_VERSION)
-AC_SUBST(BASE_DEPENDENCIES_LIBS)
+if test x$GTK_SHARP_2_0 = xyes; then
+ PKG_CHECK_MODULES(BASE_DEPENDENCIES, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(EXTRA_CRAP, gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION monodoc >= $MONODOC_REQUIRED_VERSION)
+ BASE_DEPENDENCIES_LIBS=${BASE_DEPENDENCIES_LIBS}${EXTRA_CRAP_LIBS}
+ AC_SUBST(BASE_DEPENDENCIES_LIBS)
+else
+ PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk-sharp >= $GTKSHARP_REQUIRED_VERSION glade-sharp >= $GTKSHARP_REQUIRED_VERSION gconf-sharp >= $GTKSHARP_REQUIRED_VERSION gnome-sharp >= $GTKSHARP_REQUIRED_VERSION gtkhtml-sharp >= $GTKSHARP_REQUIRED_VERSION gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION monodoc >= $MONODOC_REQUIRED_VERSION)
+ AC_SUBST(BASE_DEPENDENCIES_LIBS)
+fi
gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp`
AC_SUBST(gtksharp_prefix)
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2004-09-26 20:07:38 UTC (rev 1971)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2004-10-04 22:51:21 UTC (rev 1972)
@@ -1,3 +1,9 @@
+2004-10-04 Todd Berman <tberman at off.net>
+
+ * Gui/SourceEditorView.cs:
+ * CodeCompletion/ListWindow.cs: Need to use System.Char w/
+ gtk-sharp-2-0 for some reason. Not sure why.
+
2004-09-18 Lluis Sanchez Gual <lluis at ximian.com>
* Gui/SourceEditorView.cs: Use the new completion window.
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs 2004-09-26 20:07:38 UTC (rev 1971)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ListWindow.cs 2004-10-04 22:51:21 UTC (rev 1972)
@@ -136,12 +136,12 @@
char c = (char)e.KeyValue;
- if (Char.IsLetterOrDigit (c) || c == '_') {
+ if (System.Char.IsLetterOrDigit (c) || c == '_') {
word.Insert (curPos++, c);
UpdateWordSelection ();
return KeyAction.Process;
}
- else if ((Char.IsPunctuation (c) || c == ' ') && !list.SelectionDisabled) {
+ else if ((System.Char.IsPunctuation (c) || c == ' ') && !list.SelectionDisabled) {
return KeyAction.Complete | KeyAction.Process | KeyAction.CloseWindow;
}
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2004-09-26 20:07:38 UTC (rev 1971)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2004-10-04 22:51:21 UTC (rev 1972)
@@ -358,7 +358,7 @@
{
for ( offset-- ; offset >= 0 ; offset--)
{
- if (Char.IsWhiteSpace (doc, offset)) break;
+ if (System.Char.IsWhiteSpace (doc, offset)) break;
}
return ++offset;
}
@@ -381,7 +381,7 @@
public string GetLeadingWhiteSpace (int line) {
string lineText = ((IFormattableDocument)this).GetLineAsString (line);
int index = 0;
- while (index < lineText.Length && Char.IsWhiteSpace (lineText[index])) {
+ while (index < lineText.Length && System.Char.IsWhiteSpace (lineText[index])) {
index++;
}
return index > 0 ? lineText.Substring (0, index) : "";
More information about the Monodevelop-patches-list
mailing list