[Mono-devel-list] RE: [Mono-patches] mcs/tools/SqlSharp/gui/gtk-sharp ChangeLog,1.16,1.17 LoginDialog.cs,1.6,1.7 SqlEditorSharp.cs,1.7,1.8 sqlsharpgtk.cs,1.14,1.15

[Daniel Morgan]

Pedro,

I appreciate you doing fixes to SQL# For GTK#, but the source has been moved
to its own cvs module as sqlsharpgtk in mono cvs.  I just have not gotten
around to removing it from mcs/tools/SqlSharp/gui/gtk-sharp yet. :-)

The command-line version will stay where it is.

Cheers,
Daniel

-----Original Message-----
From: mono-patches-admin at ximian.com
[mailto:mono-patches-admin at ximian.com]On Behalf Of Pedro Martinez
<yoros at wanadoo.es>
Sent: Wednesday, November 12, 2003 6:35 PM
To: mono-patches at ximian.com
Subject: [Mono-patches] mcs/tools/SqlSharp/gui/gtk-sharp
ChangeLog,1.16,1.17 LoginDialog.cs,1.6,1.7 SqlEditorSharp.cs,1.7,1.8
sqlsharpgtk.cs,1.14,1.15


Update of /cvs/public/mcs/tools/SqlSharp/gui/gtk-sharp
In directory mono-cvs.ximian.com:/tmp/cvs-serv13230

Modified Files:
	ChangeLog LoginDialog.cs SqlEditorSharp.cs sqlsharpgtk.cs
Log Message:
2003-11-13  Pedro Martínez Juliá  <yoros at wanadoo.es>

    * LoginDialog.cs
    * SqlEditorSharp.cs
    * sqlsharpgtk.cs: Updated to the new changes in gtk-sharp
    library.



Index: ChangeLog
===================================================================
RCS file: /cvs/public/mcs/tools/SqlSharp/gui/gtk-sharp/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ChangeLog	17 Oct 2003 03:07:58 -0000	1.16
+++ ChangeLog	12 Nov 2003 23:34:48 -0000	1.17
@@ -1,3 +1,10 @@
+2003-11-13  Pedro Martínez Juliá  <yoros at wanadoo.es>
+
+	* LoginDialog.cs
+	* SqlEditorSharp.cs
+	* sqlsharpgtk.cs: Updated to the new changes in gtk-sharp
+	library.
+
 2003-10-16  Daniel Morgan <danielmorgan at verizon.net>

 	* Makefile

Index: LoginDialog.cs
===================================================================
RCS file: /cvs/public/mcs/tools/SqlSharp/gui/gtk-sharp/LoginDialog.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- LoginDialog.cs	17 Oct 2003 03:07:58 -0000	1.6
+++ LoginDialog.cs	12 Nov 2003 23:34:48 -0000	1.7
@@ -74,13 +74,13 @@
 			dialog.VBox.PackStart (frame, true, true, 0);

 			Button button = null;
-			button = Button.NewFromStock (Stock.Ok);
+			button = new Button(Stock.Ok);
 			button.Clicked += new EventHandler (Connect_Action);
 			button.CanDefault = true;
 			dialog.ActionArea.PackStart (button, true, true, 0);
 			button.GrabDefault ();

-			button = Button.NewFromStock (Stock.Cancel);
+			button = new Button(Stock.Cancel);
 			button.Clicked += new EventHandler (Dialog_Cancel);
 			dialog.ActionArea.PackStart (button, true, true, 0);
 			dialog.Modal = true;

Index: SqlEditorSharp.cs
===================================================================
RCS file: /cvs/public/mcs/tools/SqlSharp/gui/gtk-sharp/SqlEditorSharp.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SqlEditorSharp.cs	25 Apr 2003 00:54:43 -0000	1.7
+++ SqlEditorSharp.cs	12 Nov 2003 23:34:48 -0000	1.8
@@ -172,8 +172,9 @@

 			SqlSharpGtk.DebugWriteLine ("[[[[[ Syntax Hi-Light Text BEGIN ]]]]]");

-			if (use_hi_lighting == true)
+			if (use_hi_lighting == true) {
 				SyntaxHiLightText ();
+			}

 			SqlSharpGtk.DebugWriteLine ("[[[[[ Syntax Hi-Light Text END   ]]]]]\n");
 		}
@@ -250,7 +251,7 @@
 			match_start2 = start_iter; // dummy
 			match_end2 = end_iter; // dummy

-			while (start_iter.IsEnd() == false) {
+			while (start_iter.IsEnd == false) {
 				// FIXME: match_start1, match_end1, end_iter
 				//        need to be set to have ref in front
 				//        Problem with TextIter's ForwardSearch()
@@ -376,7 +377,7 @@
 				// look for singled quoted constants
 				// and keywords
 				if (hyphen < 2) {
-					if (start_iter.IsEnd() == true)
+					if (start_iter.IsEnd == true)
 						break; // break out of for loop

 					start_word = -1;
@@ -414,7 +415,7 @@
 				match_start1 = start_iter;
 				match_end1 = start_iter;

-				if (match_end1.IsEnd () == true)
+				if (match_end1.IsEnd == true)
 					break;

 				if (CharHasTag (start_iter,

Index: sqlsharpgtk.cs
===================================================================
RCS file: /cvs/public/mcs/tools/SqlSharp/gui/gtk-sharp/sqlsharpgtk.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- sqlsharpgtk.cs	17 Oct 2003 03:07:58 -0000	1.14
+++ sqlsharpgtk.cs	12 Nov 2003 23:34:48 -0000	1.15
@@ -154,6 +154,7 @@
 		{
 			SqlEditorSharp editor;
 			editor = new SqlEditorSharp ();
+			editor.UseSyntaxHiLighting = true;
 			editor.View.Show ();
 			editor.View.KeyPressEvent +=
 				new GtkSharp.KeyPressEventHandler(OnKeyPressEventKey);

_______________________________________________
Mono-patches maillist  -  Mono-patches at ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches